diff options
| -rw-r--r-- | lisp/international/quail.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 0901115cffe..c66aa6a5375 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2027,10 +2027,15 @@ minibuffer and the selected frame has no other windows)." (bury-buffer quail-completion-buf) ;; Then, show the guidance. - (when (and (quail-require-guidance-buf) - (not input-method-use-echo-area) - (null unread-command-events) - (null unread-post-input-method-events)) + (when (and + ;; Don't try to display guidance on an expired minibuffer. This + ;; would go into an infinite wait rather than executing the user's + ;; command. Bug #45792. + (not (eq major-mode 'minibuffer-inactive-mode)) + (quail-require-guidance-buf) + (not input-method-use-echo-area) + (null unread-command-events) + (null unread-post-input-method-events)) (if (minibufferp) (if (eq (minibuffer-window) (frame-root-window)) ;; Use another frame. It is sure that we are using some |