[gnus git] branch master updated: n0-17-329-g0e020af =1= Revert ecomplete patch, which didn't work on XEmacs.

       via  0e020afe803eb52571796eea4850e4a8dc33ac29 (commit)
      from  0384848978803e44b53f2e14b0f62a2d3d97f0bd (commit)


- Log -----------------------------------------------------------------
commit 0e020afe803eb52571796eea4850e4a8dc33ac29
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Sep 26 22:59:37 2011 +0200

    Revert ecomplete patch, which didn't work on XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79577df..f285bd1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,11 +5,6 @@
 	* mml.el (mml-generate-mime-1): Don't alter the contents if we're
 	computing the boundary.
 
-2011-09-22  Kan-Ru Chen  <[email protected]>
-
-	* ecomplete.el (ecomplete-display-matches): Use a local keymap to
-	handle bindings.
-
 2011-09-26  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* pop3.el (pop3-number-of-responses): Removed.
diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el
index 08b7323..6a47b11 100644
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -123,24 +123,15 @@
 	    (message "%s" matches)
 	    nil)
 	(setq highlight (ecomplete-highlight-match-line matches line))
-	(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)))))
+	(while (not (memq (setq command (read-event highlight)) '(? return)))
+	  (cond
+	   ((eq command ?\M-n)
+	    (setq line (min (1+ line) max-lines)))
+	   ((eq command ?\M-p)
+	    (setq line (max (1- line) 0))))
+	  (setq highlight (ecomplete-highlight-match-line matches line)))
+	(when (eq command 'return)
+	  (nth line (split-string matches "\n")))))))
 
 (defun ecomplete-highlight-match-line (matches line)
   (with-temp-buffer

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |    5 -----
 lisp/ecomplete.el |   27 +++++++++------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project