ecomplete.el: Intercept key sequence from terminal as well.

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbbe2f3..e776c78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/ecomplete.el b/lisp/ecomplete.el
index 6a47b11..737c0db 100644 (file)
--- a/lisp/ecomplete.el
+++ b/lisp/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)