From: Kan-Ru Chen <kanru@kanru.info>
Date: Wed, 21 Sep 2011 12:23:49 +0000 (+0000)
Subject: ecomplete.el (ecomplete-display-matches): Intercept key sequence from terminal as... 
X-Git-Tag: emacs-pretest-24.0.90~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e233ce558d12fdf9e0e69ea30c4558ec7477fea4;p=emacs.git

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

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)