[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 71491b9 04/18: Fix argument to `replace-match'
From: |
Oleh Krehel |
Subject: |
[elpa] master 71491b9 04/18: Fix argument to `replace-match' |
Date: |
Sat, 28 Mar 2015 15:04:24 +0000 |
branch: master
commit 71491b940f0ea6ab2d311aeabe83a3af4a4f4dc8
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix argument to `replace-match'
* hydra.el (hydra--format): Update.
* hydra-test.el (hydra-format-3): Add test.
Fixes #91
---
hydra-test.el | 11 +++++++++++
hydra.el | 2 +-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/hydra-test.el b/hydra-test.el
index c82b559..06aa77a 100644
--- a/hydra-test.el
+++ b/hydra-test.el
@@ -740,6 +740,17 @@ _f_ auto-fill-mode: %`auto-fill-function
("q" nil "" :cmd-name bar/nil))))
'(concat (format " bar %s\n" foo) "{a}, [q]"))))
+(ert-deftest hydra-format-3 ()
+ (should (equal
+ (let ((hydra-fontify-head-function
+ 'hydra-fontify-head-greyscale))
+ (hydra--format
+ 'bar
+ nil
+ "\n_<SPC>_ ^^ace jump\n"
+ '(("<SPC>" ace-jump-char-mode nil :cmd-name
bar/ace-jump-char-mode))))
+ '(concat (format "%s ace jump\n" "{<SPC>}") ""))))
+
(ert-deftest hydra-format-with-sexp-1 ()
(should (equal
(let ((hydra-fontify-head-function
diff --git a/hydra.el b/hydra.el
index 1b8dbb6..f4f30b9 100644
--- a/hydra.el
+++ b/hydra.el
@@ -491,7 +491,7 @@ The expressions can be auto-expanded according to NAME."
(or
hydra-key-format-spec
(concat "%" (match-string 3 docstring) "s"))
- nil nil docstring)))
+ t nil docstring)))
(error "Unrecognized key: _%s_" key))))
(t
- [elpa] master updated (059c3d5 -> da45e68), Oleh Krehel, 2015/03/28
- [elpa] master 84f4fe7 06/18: Don't default `hydra-repeat--prefix-arg' to 1, Oleh Krehel, 2015/03/28
- [elpa] master 6c6fc0b 07/18: Allow `hydra-repeat' to take a numeric arg, Oleh Krehel, 2015/03/28
- [elpa] master 87e4574 05/18: Mention the leading newline in `defhydra' docstring, Oleh Krehel, 2015/03/28
- [elpa] master 71491b9 04/18: Fix argument to `replace-match',
Oleh Krehel <=
- [elpa] master f6697f3 02/18: Allow for the "%s`foo" spec., Oleh Krehel, 2015/03/28
- [elpa] master 5c3ab46 08/18: hydra.el (hydra--format): Amend regex, Oleh Krehel, 2015/03/28
- [elpa] master 1bad0c4 09/18: hydra.el (hydra--format): Update regex order, Oleh Krehel, 2015/03/28
- [elpa] master 03771f4 01/18: hydra.el: Turn on lexical-binding, Oleh Krehel, 2015/03/28
- [elpa] master fe1cfee 10/18: hydra-examples.el (hydra-rectangle): Update, Oleh Krehel, 2015/03/28
- [elpa] master c8c6b8c 03/18: Fix blue/red heads with same cmd, Oleh Krehel, 2015/03/28
- [elpa] master 1290237 12/18: Disable key-chord for the duration of the hydra, Oleh Krehel, 2015/03/28
- [elpa] master cb4b78a 11/18: hydra-test.el (hydra-format-4): Add test, Oleh Krehel, 2015/03/28
- [elpa] master 640af46 13/18: hydra.el (defhydra): Improve docstring, Oleh Krehel, 2015/03/28
- [elpa] master 7843563 14/18: hydra.el (hydra--make-funcall): Add, Oleh Krehel, 2015/03/28