Mercurial > emacs
changeset 99198:96652546aa33
(quail-show-guidance): Don't create a guidance-frame if current buffer is
not a minibuffer, since even if selected-window is mini-p, the buffer will
never be displayed in it, so it wil be usable for guidance.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 29 Oct 2008 01:44:45 +0000 |
| parents | 7548cef42245 |
| children | 006d8b24fed3 |
| files | lisp/ChangeLog lisp/international/quail.el |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Oct 28 22:12:32 2008 +0000 +++ b/lisp/ChangeLog Wed Oct 29 01:44:45 2008 +0000 @@ -1,3 +1,10 @@ +2008-10-29 Stefan Monnier <monnier@iro.umontreal.ca> + + * international/quail.el (quail-show-guidance): Don't create + a guidance-frame if current buffer is not a minibuffer, since even if + selected-window is mini-p, the buffer will never be displayed in it, so + it wil be usable for guidance. + 2008-10-28 Stefan Monnier <monnier@iro.umontreal.ca> * smerge-mode.el: Require diff-mode at run-time as well.
--- a/lisp/international/quail.el Tue Oct 28 22:12:32 2008 +0000 +++ b/lisp/international/quail.el Wed Oct 29 01:44:45 2008 +0000 @@ -231,7 +231,7 @@ ;;;###autoload (defun quail-use-package (package-name &rest libraries) "Start using Quail package PACKAGE-NAME. -The remaining arguments are libraries to be loaded before using the package. +The remaining arguments are LIBRARIES to be loaded before using the package. This activates input method defined by PACKAGE-NAME by running `quail-activate', which see." @@ -545,7 +545,7 @@ (defun quail-activate (&optional arg) "Activate Quail input method. -With arg, activate Quail input method if and only if arg is positive. +With ARG, activate Quail input method if and only if arg is positive. This function runs `quail-activate-hook' if it activates the input method, `quail-inactivate-hook' if it deactivates it. @@ -1974,7 +1974,7 @@ (not input-method-use-echo-area) (null unread-command-events) (null unread-post-input-method-events)) - (if (eq (selected-window) (minibuffer-window)) + (if (minibufferp) (if (eq (minibuffer-window) (frame-root-window)) ;; Use another frame. It is sure that we are using some ;; window system.