[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 9ca6f48 30/63: Allow "C-g" to interrupt ivy-dispatching-do
From: |
Oleh Krehel |
Subject: |
[elpa] master 9ca6f48 30/63: Allow "C-g" to interrupt ivy-dispatching-done |
Date: |
Fri, 21 Aug 2015 12:08:38 +0000 |
branch: master
commit 9ca6f48c7957fe7e9e0d7b83f81a15a961c35249
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Allow "C-g" to interrupt ivy-dispatching-done
* ivy.el (ivy-dispatching-done): Update.
---
ivy.el | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ivy.el b/ivy.el
index 8e24f1f..5f8e5de 100644
--- a/ivy.el
+++ b/ivy.el
@@ -286,11 +286,13 @@ When non-nil, it should contain one %d.")
"\n"))
(key (string (read-key hint)))
(action (assoc key (cdr actions))))
- (if (null action)
- (error "%s is not bound" key)
- (message "")
- (ivy-set-action (nth 1 action))
- (ivy-done))))))
+ (cond ((string= key ""))
+ ((null action)
+ (error "%s is not bound" key))
+ (t
+ (message "")
+ (ivy-set-action (nth 1 action))
+ (ivy-done)))))))
(defun ivy-build-tramp-name (x)
"Reconstruct X into a path.
- [elpa] master ea6525e 18/63: ivy.el (ivy-read): Improve ivy-set-actions interaction, (continued)
- [elpa] master ea6525e 18/63: ivy.el (ivy-read): Improve ivy-set-actions interaction, Oleh Krehel, 2015/08/21
- [elpa] master e9c2538 19/63: counsel.el (counsel-rhythmbox-history): Add, Oleh Krehel, 2015/08/21
- [elpa] master 21007c2 17/63: Add counsel-rhythmbox, Oleh Krehel, 2015/08/21
- [elpa] master de2e819 20/63: Allow % in prompt string, Oleh Krehel, 2015/08/21
- [elpa] master 22ee8a6 23/63: swiper.el (swiper-font-lock-ensure): Ignore Man-mode, Oleh Krehel, 2015/08/21
- [elpa] master 8c91662 22/63: ivy.el (ivy-call): Bind to "C-M-m" or "M-RET", Oleh Krehel, 2015/08/21
- [elpa] master 3df2d8e 26/63: ivy-hydra.el: Add featurep for hydra, Oleh Krehel, 2015/08/21
- [elpa] master d289b78 15/63: Add a new interface to customize additional exit points, Oleh Krehel, 2015/08/21
- [elpa] master 1092e2d 24/63: swiper.el: Update avy--goto -> avy-action-goto, Oleh Krehel, 2015/08/21
- [elpa] master adad288 27/63: ivy.el (ivy-call): Add selected-window work-around for M-x, Oleh Krehel, 2015/08/21
- [elpa] master 9ca6f48 30/63: Allow "C-g" to interrupt ivy-dispatching-done,
Oleh Krehel <=
- [elpa] master 5480079 28/63: ivy.el (ivy-dispatching-done): New command on "M-o", Oleh Krehel, 2015/08/21
- [elpa] master 6062903 21/63: ivy.el (ivy-count-format): Improve docstring, Oleh Krehel, 2015/08/21
- [elpa] master e91a4eb 31/63: ivy.el (ivy-dispatching-done): Display the candidate, Oleh Krehel, 2015/08/21
- [elpa] master 3464362 33/63: Add actions for counsel-describe-variable, Oleh Krehel, 2015/08/21
- [elpa] master 31d664a 32/63: ivy.el (ivy-dispatching-done): Add a trailing newline, Oleh Krehel, 2015/08/21
- [elpa] master 107ebff 34/63: Add actions for counsel-describe-function, Oleh Krehel, 2015/08/21
- [elpa] master 2fbcfb9 29/63: ivy.el (ivy--preselect-index): Add matcher to arglist, Oleh Krehel, 2015/08/21
- [elpa] master cb0cf02 35/63: ivy.el (ivy-call): Remove with-selected-window, Oleh Krehel, 2015/08/21
- [elpa] master 08bd5b4 25/63: counsel.el (counsel-variable-list): Add, Oleh Krehel, 2015/08/21
- [elpa] master ae77d93 36/63: counsel.el (counsel-org-tag): Replace org-set-tags, Oleh Krehel, 2015/08/21