[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 632af83 17/22: ivy.el (ivy-done): Fixup
From: |
Oleh Krehel |
Subject: |
[elpa] master 632af83 17/22: ivy.el (ivy-done): Fixup |
Date: |
Wed, 22 Apr 2015 19:51:51 +0000 |
branch: master
commit 632af83c1804fb5e3c78ad824b673c5b2dfb86f9
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy-done): Fixup
---
ivy.el | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ivy.el b/ivy.el
index dfcb266..7311077 100644
--- a/ivy.el
+++ b/ivy.el
@@ -185,23 +185,21 @@ When non-nil, it should contain one %d.")
((zerop ivy--length)
(if (memq ivy-require-match
'(nil confirm confirm-after-completion))
- (if (= ivy--length 0)
- t
+ (progn
(insert ivy-text)
(setq ivy-exit 'done))
- (progn
- (unless (string-match "match required" ivy--prompt)
- (setq ivy--prompt
- (if (string-match ": $" ivy--prompt)
- (concat
- (substring ivy--prompt 0 -2)
- " (match required): ")
+ (unless (string-match "match required" ivy--prompt)
+ (setq ivy--prompt
+ (if (string-match ": $" ivy--prompt)
(concat
- ivy--prompt
- "(match required) "))))
- (insert ivy-text)
- (ivy--exhibit)
- nil)))
+ (substring ivy--prompt 0 -2)
+ " (match required): ")
+ (concat
+ ivy--prompt
+ "(match required) "))))
+ (insert ivy-text)
+ (ivy--exhibit)
+ nil))
(t
(insert ivy--current)
(setq ivy-exit 'done)))
- [elpa] master fb805a0 08/22: README.md: Add a note on outdated ivy package, (continued)
- [elpa] master fb805a0 08/22: README.md: Add a note on outdated ivy package, Oleh Krehel, 2015/04/22
- [elpa] master 70c5fe8 13/22: Bind "M-q" to `ivy-toggle-regexp-quote', Oleh Krehel, 2015/04/22
- [elpa] master 7edfbc9 14/22: ivy.el (ivy--exhibit): Wrap in `while-no-input', Oleh Krehel, 2015/04/22
- [elpa] master 1fad831 10/22: Change `ivy-read' to a cl-defun, Oleh Krehel, 2015/04/22
- [elpa] master e78557a 15/22: swiper.el (swiper--ivy): Fix preselect being added, Oleh Krehel, 2015/04/22
- [elpa] master 28abaa9 12/22: Allow to customize the regex matching per-collection, Oleh Krehel, 2015/04/22
- [elpa] master dd4aced 16/22: ivy.el (ivy--add-face): Don't fail for weird str, Oleh Krehel, 2015/04/22
- [elpa] master 6d801a6 19/22: ivy-test.el (ivy-read): Update test., Oleh Krehel, 2015/04/22
- [elpa] master 5c03c2b 18/22: ivy.el (ivy-read): Fix preselect logic, Oleh Krehel, 2015/04/22
- [elpa] master f9947de 20/22: Fixup `swiper-query-replace', Oleh Krehel, 2015/04/22
- [elpa] master 632af83 17/22: ivy.el (ivy-done): Fixup,
Oleh Krehel <=
- [elpa] master e2452a3 21/22: README.md: Update video link, Oleh Krehel, 2015/04/22
- [elpa] master c7a6156 22/22: Merge commit 'e2452a3e77ef6ea6b193292d2c0bbbe93dd4b078' from swiper, Oleh Krehel, 2015/04/22