From 9b76297dc5bbd9a2c03fb48fcbd2d3f0ae9d6dda Mon Sep 17 00:00:00 2001 From: Kan-Ru Chen Date: Mon, 26 Sep 2011 21:03:02 +0200 Subject: [PATCH] * ecomplete.el (ecomplete-display-matches): Use a local keymap to handle bindings. --- lisp/ChangeLog | 5 +++++ lisp/ecomplete.el | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 72641dec7..67a09aea1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-09-22 Kan-Ru Chen + + * ecomplete.el (ecomplete-display-matches): Use a local keymap to + handle bindings. + 2011-09-26 Lars Magne Ingebrigtsen * pop3.el (pop3-number-of-responses): Removed. diff --git a/lisp/ecomplete.el b/lisp/ecomplete.el index 6a47b119f..08b7323cc 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 -- 2.25.1