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 ?.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c7ba8541df..bf235638416 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * minibuffer.el (completion-in-region-mode-map): Bind
+        completion-help-at-point to M-? rather than ?.  (Bug#11182)
+
 2012-04-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * window.el (shrink-window): Mention the `window-min-height'
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index bcc6a808d22..db7743970d4 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1506,7 +1506,7 @@ exit."
   (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'.")