[Emacs-diffs] emacs-24 r117011: * lisp/simple.el (completion-list-mode-map): Use choose-completion for the

[Stefan Monnier]

------------------------------------------------------------
revno: 117011
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17302
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-22 22:22:06 -0400
message:
  * lisp/simple.el (completion-list-mode-map): Use choose-completion for the
  mouse binding as well.
  (completion-list-mode, completion-setup-function): Adjust docstring and
  echo area message accordingly.
  * lisp/progmodes/idlwave.el (idlwave-choose-completion): Adjust to new
  calling convention of choose-completion.
  * lisp/comint.el (comint-dynamic-list-completions):
  * lisp/term.el (term-dynamic-list-completions): Accept choose-completion.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/comint.el                 comint.el-20091113204419-o5vbwnq5f7feedwu-149
  lisp/progmodes/idlwave.el      idlwave.el-20091113204419-o5vbwnq5f7feedwu-1731
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403
  lisp/term.el                   term.el-20091113204419-o5vbwnq5f7feedwu-794

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-23 01:56:18 +0000
+++ b/lisp/ChangeLog    2014-04-23 02:22:06 +0000
@@ -1,5 +1,14 @@
 2014-04-23  Stefan Monnier  <address@hidden>
 
+       * simple.el (completion-list-mode-map): Use choose-completion for the
+       mouse binding as well (bug#17302).
+       (completion-list-mode, completion-setup-function): Adjust docstring and
+       echo area message accordingly.
+       * progmodes/idlwave.el (idlwave-choose-completion): Adjust to new
+       calling convention of choose-completion.
+       * comint.el (comint-dynamic-list-completions):
+       * term.el (term-dynamic-list-completions): Accept choose-completion.
+
        * progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
        &, |, +, - and * can't be a division (bug#17317).
 

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2014-03-01 02:31:05 +0000
+++ b/lisp/comint.el    2014-04-23 02:22:06 +0000
@@ -3326,8 +3326,9 @@
            (and (consp first) (consp (event-start first))
                 (eq (window-buffer (posn-window (event-start first)))
                     (get-buffer "*Completions*"))
-                (eq (key-binding key) 'mouse-choose-completion)))
-         ;; If the user does mouse-choose-completion with the mouse,
+                (memq (key-binding key)
+                       '(mouse-choose-completion choose-completion))))
+         ;; If the user does choose-completion with the mouse,
          ;; execute the command, then delete the completion window.
          (progn
            (choose-completion first)

=== modified file 'lisp/progmodes/idlwave.el'
--- a/lisp/progmodes/idlwave.el 2014-01-27 02:02:28 +0000
+++ b/lisp/progmodes/idlwave.el 2014-04-23 02:22:06 +0000
@@ -7170,7 +7170,7 @@
 
 (defun idlwave-choose-completion (&rest args)
   "Choose the completion that point is in or next to."
-  (interactive)
+  (interactive (list last-nonmenu-event))
   (apply 'idlwave-choose 'choose-completion args))
 
 (defun idlwave-mouse-choose-completion (&rest args)

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2014-04-12 19:20:44 +0000
+++ b/lisp/simple.el    2014-04-23 02:22:06 +0000
@@ -6870,7 +6870,7 @@
 
 (defvar completion-list-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-2] 'mouse-choose-completion)
+    (define-key map [mouse-2] 'choose-completion)
     (define-key map [follow-link] 'mouse-face)
     (define-key map [down-mouse-2] nil)
     (define-key map "\C-m" 'choose-completion)
@@ -7119,8 +7119,7 @@
   "Major mode for buffers showing lists of possible completions.
 Type \\<completion-list-mode-map>\\[choose-completion] in the completion list\
  to select the completion near point.
-Use \\<completion-list-mode-map>\\[mouse-choose-completion] to select one\
- with the mouse.
+Or click to select one with the mouse.
 
 \\{completion-list-mode-map}"
   (set (make-local-variable 'completion-base-size) nil))
@@ -7178,7 +7177,7 @@
        (goto-char (point-min))
        (if (display-mouse-p)
            (insert (substitute-command-keys
-                    "Click \\[mouse-choose-completion] on a completion to 
select it.\n")))
+                    "Click on a completion to select it.\n")))
        (insert (substitute-command-keys
                 "In this buffer, type \\[choose-completion] to \
 select the completion near point.\n\n"))))))

=== modified file 'lisp/term.el'
--- a/lisp/term.el      2014-01-22 10:29:23 +0000
+++ b/lisp/term.el      2014-04-23 02:22:06 +0000
@@ -4137,8 +4137,9 @@
            (and (consp first)
                 (eq (window-buffer (posn-window (event-start first)))
                     (get-buffer "*Completions*"))
-                (eq (key-binding key) 'mouse-choose-completion)))
-         ;; If the user does mouse-choose-completion with the mouse,
+                (memq (key-binding key)
+                       '(mouse-choose-completion choose-completion))))
+         ;; If the user does choose-completion with the mouse,
          ;; execute the command, then delete the completion window.
          (progn
            (choose-completion first)