diff options
author | Glenn Morris <rgm@gnu.org> | 2012-04-13 18:46:06 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2012-04-13 18:46:06 -0700 |
commit | 35dc09a19c606f9e7a078df32d030451c7c90ba1 (patch) | |
tree | 8df2ade99ad8620568094d61bba9dd4ac8856c43 /lisp/minibuffer.el | |
parent | 327732d994c98849c765659aa2164a7482b6beab (diff) | |
parent | ad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7 (diff) | |
download | emacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.tar.gz |
Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org
Diffstat (limited to 'lisp/minibuffer.el')
-rw-r--r-- | lisp/minibuffer.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index eb731897212..c7e14ca481b 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'.") |