branch: master
commit 59c5f166eae1ff18c8bc7ce4a1286fb6162b9fee
Author: Stephen Whipple <s...@wicdmedia.org>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
Special case empty ivy-count-format completion.
- Switch ivy-count-format test to empty string rather than nil.
- Since the prompt is based on user input, sanitize the prompt to
later be formatted, except in the case of empty ivy-count-format.
Fixes #349
---
ivy.el | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ivy.el b/ivy.el
index 33c9017..96b04e0 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1412,10 +1412,14 @@ The previous string is between `ivy-completion-beg' and
`ivy-completion-end'."
(substring-no-properties
(car comps))))
(let* ((w (1+ (floor (log (length comps) 10))))
- (ivy-count-format (and ivy-count-format
- (format "%%-%dd " w))))
+ (ivy-count-format (if (string= ivy-count-format "")
+ ivy-count-format
+ (format "%%-%dd " w)))
+ (prompt (format "(%s): " str)))
(and
- (ivy-read (format "(%s): " str)
+ (ivy-read (if (string= ivy-count-format "")
+ prompt
+ (replace-regexp-in-string "%" "%%" prompt))
;; remove 'completions-first-difference face
(mapcar #'substring-no-properties comps)
:predicate predicate
