ecomplete.el (ecomplete-display-matches): Intercept key sequence from terminal as well.

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f3a6024069e..2487f21c151 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-13  Kan-Ru Chen  <kanru@kanru.info>
+
+        * ecomplete.el (ecomplete-display-matches): Intercept key sequence from
+        terminal as well.
+
 2011-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-view.el (mm-display-inline-fontify): Don't run doc-view-mode
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index 6a47b119f10..737c0dba1d9 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -123,14 +123,15 @@
             (message "%s" matches)
             nil)
         (setq highlight (ecomplete-highlight-match-line matches line))
-        (while (not (memq (setq command (read-event highlight)) '(? return)))
+        (while (not (member (setq command (read-key-sequence-vector highlight))
+                            '([? ] [return] [?\r] [?\n] [?\C-g])))
           (cond
-           ((eq command ?\M-n)
+           ((member command '([27 ?n] [?\M-n]))
             (setq line (min (1+ line) max-lines)))
-           ((eq command ?\M-p)
+           ((member command '([27 ?p] [?\M-p]))
             (setq line (max (1- line) 0))))
           (setq highlight (ecomplete-highlight-match-line matches line)))
-        (when (eq command 'return)
+        (when (member command '([return] [?\r] [?\n]))
           (nth line (split-string matches "\n")))))))
 
 (defun ecomplete-highlight-match-line (matches line)