X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fecomplete.el;h=a8b0561c3caae262ed310def5fdf44f643bf8382;hb=8381633c0d11c104699e2c5c0ec6cd370c11c2c7;hp=737c0dba1d9b2895cc5ee56de0d4275cf4026c1e;hpb=da609873e156b8991e02fb6d3fa3c8c74c29bced;p=gnus

diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el
index 737c0dba1..a8b0561c3 100644
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -1,6 +1,6 @@
 ;;; ecomplete.el --- electric completion of addresses and the like
 
-;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail
@@ -27,6 +27,11 @@
 (eval-when-compile
   (require 'cl))
 
+(eval-when-compile
+  (when (featurep 'xemacs)
+    ;; The `kbd' macro requires that the `read-kbd-macro' macro is available.
+    (require 'edmacro)))
+
 (defgroup ecomplete nil
   "Electric completion of email addresses and the like."
   :group 'mail)
@@ -123,16 +128,24 @@
 	    (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])))
-	  (cond
-	   ((member command '([27 ?n] [?\M-n]))
-	    (setq line (min (1+ line) max-lines)))
-	   ((member command '([27 ?p] [?\M-p]))
-	    (setq line (max (1- line) 0))))
-	  (setq highlight (ecomplete-highlight-match-line matches line)))
-	(when (member command '([return] [?\r] [?\n]))
-	  (nth line (split-string matches "\n")))))))
+	(let ((local-map (make-sparse-keymap))
+	      selected)
+	  (define-key local-map (kbd "RET")
+	    (lambda () (setq selected (nth line (split-string matches "\n")))))
+	  (define-key local-map (kbd "M-n")
+	    (lambda () (setq line (min (1+ line) max-lines))))
+	  (define-key local-map (kbd "M-p")
+	    (lambda () (setq line (max (1- line) 0))))
+	  (let ((overriding-local-map local-map))
+	    (while (and (null selected)
+			(setq command (read-key-sequence highlight))
+			(lookup-key local-map command))
+	      (apply (key-binding command) nil)
+	      (setq highlight (ecomplete-highlight-match-line matches line))))
+	  (if selected
+	      (message selected)
+	    (message "Abort"))
+	  selected)))))
 
 (defun ecomplete-highlight-match-line (matches line)
   (with-temp-buffer