[gnus git] branch master updated: n0-17-326-g9b76297 =1= * ecomplete.el (ecomplete-display-matches): Use a local keymap to handle bindings.

       via  9b76297dc5bbd9a2c03fb48fcbd2d3f0ae9d6dda (commit)
      from  27d9bdbd6c8010ee821a049d7054f81e9d758c7d (commit)


- Log -----------------------------------------------------------------
commit 9b76297dc5bbd9a2c03fb48fcbd2d3f0ae9d6dda
Author: Kan-Ru Chen <[email protected]>
Date:   Mon Sep 26 21:03:02 2011 +0200

    * ecomplete.el (ecomplete-display-matches): Use a local keymap to
    handle bindings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72641de..67a09ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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 6a47b11..08b7323 100644
--- a/lisp/ecomplete.el
+++ b/lisp/ecomplete.el
@@ -123,15 +123,24 @@
 	    (message "%s" matches)
 	    nil)
 	(setq highlight (ecomplete-highlight-match-line matches line))
-	(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")))))))
+	(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

-----------------------------------------------------------------------
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, 23 insertions(+), 9 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