[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master ba61006 2/7: Allow e.g. "_M-\\^_" in docstrings
From: |
Oleh Krehel |
Subject: |
[elpa] master ba61006 2/7: Allow e.g. "_M-\\^_" in docstrings |
Date: |
Fri, 04 Mar 2016 19:59:49 +0000 |
branch: master
commit ba61006bff386266ae1c345c15ef93294423770f
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Allow e.g. "_M-\\^_" in docstrings
* hydra.el (hydra--format): Update regexp. Warn instead of error on
unrecognized keys.
Fixes #178
---
hydra.el | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hydra.el b/hydra.el
index 898e209..2d5f440 100644
--- a/hydra.el
+++ b/hydra.el
@@ -586,7 +586,7 @@ The expressions can be auto-expanded according to NAME."
offset)
(while (setq start
(string-match
- "\\(?:%\\(
?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:_\\(
?-?[0-9]*?\\)\\(\\[\\|]\\|[-[:alnum:] ~.,;:/|?<>address@hidden&]+?\\)_\\)"
+ "\\(?:%\\(
?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:_\\(
?-?[0-9]*?\\)\\(\\[\\|]\\|[-[:alnum:] ~.,;:/|?<>address@hidden&^]+?\\)_\\)"
docstring start))
(cond ((eq ?_ (aref (match-string 0 docstring) 0))
(let* ((key (match-string 4 docstring))
@@ -601,7 +601,7 @@ The expressions can be auto-expanded according to NAME."
hydra-key-format-spec
(concat "%" (match-string 3 docstring) "s"))
t nil docstring)))
- (error "Unrecognized key: _%s_" key))))
+ (warn "Unrecognized key: _%s_" key))))
(t
(let* ((varp (if (eq ?` (aref (match-string 2 docstring) 0)) 1 0))
- [elpa] master updated (5cf5b85 -> ab7d7f3), Oleh Krehel, 2016/03/04
- [elpa] master 97cf997 4/7: Use set+make-local-variable instead of setq-local for older versions(<24.3), Oleh Krehel, 2016/03/04
- [elpa] master e0454a1 6/7: Add .elpaignore, Oleh Krehel, 2016/03/04
- [elpa] master 7f022f7 1/7: Fix unbind of key-chord when hydra is active, Oleh Krehel, 2016/03/04
- [elpa] master 47fb132 3/7: hydra-examples.el (hydra-rectangle): Use better commands, Oleh Krehel, 2016/03/04
- [elpa] master 04cd3e4 5/7: hydra-examples.el (rect): Add require, Oleh Krehel, 2016/03/04
- [elpa] master ab7d7f3 7/7: Merge commit 'e0454a100541ce3f1f732b97894a3441cef3316f' from hydra, Oleh Krehel, 2016/03/04
- [elpa] master ba61006 2/7: Allow e.g. "_M-\\^_" in docstrings,
Oleh Krehel <=