[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/international/quail.el
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/international/quail.el |
Date: |
Wed, 22 Dec 2004 00:56:02 -0500 |
Index: emacs/lisp/international/quail.el
diff -c emacs/lisp/international/quail.el:1.137
emacs/lisp/international/quail.el:1.138
*** emacs/lisp/international/quail.el:1.137 Wed May 12 10:58:35 2004
--- emacs/lisp/international/quail.el Wed Dec 22 05:44:13 2004
***************
*** 1371,1381 ****
(while quail-translating
(set-buffer-modified-p modified-p)
(quail-show-guidance)
! (let* ((keyseq (read-key-sequence
! (and input-method-use-echo-area
! (concat input-method-previous-message
! quail-current-str))
! nil nil t))
(cmd (lookup-key (quail-translation-keymap) keyseq)))
(if (if key
(and (commandp cmd) (not (eq cmd 'quail-other-command)))
--- 1371,1382 ----
(while quail-translating
(set-buffer-modified-p modified-p)
(quail-show-guidance)
! (let* ((prompt (if input-method-use-echo-area
! (format "%s%s %s"
! (or input-method-previous-message "")
! quail-current-str
! quail-guidance-str)))
! (keyseq (read-key-sequence prompt nil nil t))
(cmd (lookup-key (quail-translation-keymap) keyseq)))
(if (if key
(and (commandp cmd) (not (eq cmd 'quail-other-command)))
***************
*** 1436,1447 ****
quail-translating t)
(quail-setup-overlays nil)))
(quail-show-guidance)
! (let* ((keyseq (read-key-sequence
! (and input-method-use-echo-area
! (concat input-method-previous-message
! quail-conversion-str
! quail-current-str))
! nil nil t))
(cmd (lookup-key (quail-conversion-keymap) keyseq)))
(if (if key (commandp cmd) (eq cmd 'quail-self-insert-command))
(progn
--- 1437,1449 ----
quail-translating t)
(quail-setup-overlays nil)))
(quail-show-guidance)
! (let* ((prompt (if input-method-use-echo-area
! (format "%s%s%s %s"
! (or input-method-previous-message "")
! quail-conversion-str
! quail-current-str
! quail-guidance-str)))
! (keyseq (read-key-sequence prompt nil nil t))
(cmd (lookup-key (quail-conversion-keymap) keyseq)))
(if (if key (commandp cmd) (eq cmd 'quail-self-insert-command))
(progn
***************
*** 1950,1959 ****
;; Then, show the guidance.
(when (and (quail-require-guidance-buf)
(null unread-command-events)
(null unread-post-input-method-events))
! (if (or (eq (selected-window) (minibuffer-window))
! input-method-use-echo-area)
(if (eq (minibuffer-window) (frame-root-window))
;; Use another frame. It is sure that we are using some
;; window system.
--- 1952,1961 ----
;; 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))
! (if (eq (selected-window) (minibuffer-window))
(if (eq (minibuffer-window) (frame-root-window))
;; Use another frame. It is sure that we are using some
;; window system.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/international/quail.el,
Kenichi Handa <=