* ecomplete.el (ecomplete-display-matches): Revert patch since it doesn't work under...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc4b691..b07501e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * ecomplete.el (ecomplete-display-matches): Revert patch since it
+       doesn't work under XEmacs.
+
        * nnimap.el (nnimap-map-port): New function to connect to 993 instead
        of "imaps" to word around Windows problems.
        (nnimap-open-connection-1): Use it.

diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el
index 737c0db..6a47b11 100644 (file)
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -123,15 +123,14 @@
            (message "%s" matches)
            nil)
        (setq highlight (ecomplete-highlight-match-line matches line))
-       (while (not (member (setq command (read-key-sequence-vector highlight))
-                           '([? ] [return] [?\r] [?\n] [?\C-g])))
+       (while (not (memq (setq command (read-event highlight)) '(? return)))
          (cond
-          ((member command '([27 ?n] [?\M-n]))
+          ((eq command ?\M-n)
            (setq line (min (1+ line) max-lines)))
-          ((member command '([27 ?p] [?\M-p]))
+          ((eq command ?\M-p)
            (setq line (max (1- line) 0))))
          (setq highlight (ecomplete-highlight-match-line matches line)))
-       (when (member command '([return] [?\r] [?\n]))
+       (when (eq command 'return)
          (nth line (split-string matches "\n")))))))
 
 (defun ecomplete-highlight-match-line (matches line)