branch: master
commit c1ea2af5cba8b38903abaea81866f65564d5d943
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
ivy.el (ivy-read): Fix conflict an existing read-key session
Fixes #2230
---
ivy.el | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ivy.el b/ivy.el
index c8ac5f1..a5f5591 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2063,6 +2063,9 @@ candidates is updated after each input by calling
COLLECTION.
CALLER is a symbol to uniquely identify the caller to `ivy-read'.
It is used, along with COLLECTION, to determine which
customizations apply to the current completion session."
+ ;; get un-stuck from an existing `read-key' overriding minibuffer keys
+ (when (equal overriding-local-map '(keymap))
+ (keyboard-quit))
(setq caller (or caller this-command))
(let* ((ivy-recursive-last (and (active-minibuffer-window) ivy-last))
(ivy--display-function
