[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master db283d3 005/272: Fix recursive minibuffer exit with "C-g"
From: |
Oleh Krehel |
Subject: |
[elpa] master db283d3 005/272: Fix recursive minibuffer exit with "C-g" |
Date: |
Mon, 25 Apr 2016 10:13:13 +0000 |
branch: master
commit db283d3c25bf8e903b215bc1d318c76c90e04689
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix recursive minibuffer exit with "C-g"
* ivy.el (ivy-read): Make it so e.g. "C-h f C-h v C-g" goes back to the
describe-function selection.
---
ivy.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ivy.el b/ivy.el
index 6fd361b..a0bbbd8 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1151,7 +1151,10 @@ customizations apply to the current completion session."
res)))
(remove-hook 'post-command-hook #'ivy--exhibit)
(when (setq unwind (ivy-state-unwind ivy-last))
- (funcall unwind)))
+ (funcall unwind))
+ (unless (eq ivy-exit 'done)
+ (when recursive-ivy-last
+ (ivy--reset-state (setq ivy-last recursive-ivy-last)))))
(ivy-call)
(when (and recursive-ivy-last
ivy-recursive-restore)
- [elpa] master updated (03d2b00 -> 39a458e), Oleh Krehel, 2016/04/25
- [elpa] master 8306be1 006/272: Fix compilation warnings, Oleh Krehel, 2016/04/25
- [elpa] master a4317f9 002/272: ivy.el (ivy--get-window): Return a valid window, Oleh Krehel, 2016/04/25
- [elpa] master 83f89d8 003/272: Improve swiper for multiple occurrences on one line, Oleh Krehel, 2016/04/25
- [elpa] master db283d3 005/272: Fix recursive minibuffer exit with "C-g",
Oleh Krehel <=
- [elpa] master cabab4b 012/272: swiper.el (swiper-font-lock-ensure): Add bongo-library-mode, Oleh Krehel, 2016/04/25
- [elpa] master 2c50031 004/272: Fix ivy-reverse-i-search broken by recursive update, Oleh Krehel, 2016/04/25
- [elpa] master 6951eba 001/272: Make ivy--regex-plus recognize ! at the beginning of the str, Oleh Krehel, 2016/04/25
- [elpa] master d74fab4 010/272: counsel.el (counsel-M-x): Let-bind this-command, Oleh Krehel, 2016/04/25
- [elpa] master fd27465 014/272: counsel.el (counsel-git): Fix window selection, Oleh Krehel, 2016/04/25
- [elpa] master 6bf72fd 008/272: counsel.el (counsel-imenu): Work when given positions are overlays, Oleh Krehel, 2016/04/25
- [elpa] master 63be079 009/272: ivy.el (ivy-re-builders-alist): Allow this-command to be a key, Oleh Krehel, 2016/04/25
- [elpa] master 09848ca 013/272: Add cousel-ag-base-command var, Oleh Krehel, 2016/04/25
- [elpa] master adfad96 007/272: support imenu, Oleh Krehel, 2016/04/25
- [elpa] master d09a16b 011/272: swiper.el (swiper-font-lock-ensure): Add bongo-playlist-mode, Oleh Krehel, 2016/04/25