[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107782: Fix bug #11182 with the effect of typing '?' in Shell mode.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107782
fixes bug(s): http://debbugs.gnu.org/11182
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-04-07 11:12:04 +0300
message:
  Fix bug #11182 with the effect of typing '?' in Shell mode.
  
   lisp/minibuffer.el (completion-in-region-mode-map): Bind
   completion-help-at-point to M-? rather than ?.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-05 22:26:20 +0000
+++ b/lisp/ChangeLog    2012-04-07 08:12:04 +0000
@@ -1,3 +1,8 @@
+2012-04-07  Eli Zaretskii  <address@hidden>
+
+       * minibuffer.el (completion-in-region-mode-map): Bind
+       completion-help-at-point to M-? rather than ?.  (Bug#11182)
+
 2012-04-05  Lars Magne Ingebrigtsen  <address@hidden>
 
        * window.el (shrink-window): Mention the `window-min-height'

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2012-04-04 09:19:32 +0000
+++ b/lisp/minibuffer.el        2012-04-07 08:12:04 +0000
@@ -1506,7 +1506,7 @@
   (let ((map (make-sparse-keymap)))
     ;; FIXME: Only works if completion-in-region-mode was activated via
     ;; completion-at-point called directly.
-    (define-key map "?" 'completion-help-at-point)
+    (define-key map "\M-?" 'completion-help-at-point)
     (define-key map "\t" 'completion-at-point)
     map)
   "Keymap activated during `completion-in-region'.")