diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/international/quail.el | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 41261a250e8..50b61067a3a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/international/quail.el b/lisp/international/quail.el index e1bb93a1576..dff12e5c025 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -231,7 +231,7 @@ Conversion keymap is a keymap used while conversion region is active ;;;###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 @@ This function runs the normal hook `quail-inactivate-hook'." (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 @@ minibuffer and the selected frame has no other windows)." (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. |