(minibuffer-local-map): Also bind next, C-n, C-s, prior,

C-p and C-r.  Remove redundant bindings from inheriting maps.

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 04606badb24501a99291c3d95ea2f47d90a26188..d0f06120feadf391ae74e04554fa002dac1d7f3d 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -594,15 +594,15 @@ language you are using."
 (define-key esc-map "!" 'shell-command)
 (define-key esc-map "|" 'shell-command-on-region)
 
-;; This is an experiment--make up and down arrows do history.
-(define-key minibuffer-local-map [up] 'previous-history-element)
-(define-key minibuffer-local-map [down] 'next-history-element)
-(define-key minibuffer-local-ns-map [up] 'previous-history-element)
-(define-key minibuffer-local-ns-map [down] 'next-history-element)
-(define-key minibuffer-local-completion-map [up] 'previous-history-element)
-(define-key minibuffer-local-completion-map [down] 'next-history-element)
-(define-key minibuffer-local-must-match-map [up] 'previous-history-element)
-(define-key minibuffer-local-must-match-map [down] 'next-history-element)
+(let ((map minibuffer-local-map))
+  (define-key map "\en"   'next-history-element)
+  (define-key map [next]  'next-history-element)
+  (define-key map [down]  'next-history-element)
+  (define-key map "\ep"   'previous-history-element)
+  (define-key map [prior] 'previous-history-element)
+  (define-key map [up]    'previous-history-element)
+  (define-key map "\es"   'next-matching-history-element)
+  (define-key map "\er"   'previous-matching-history-element))
 
 (define-key global-map "\C-u" 'universal-argument)
 (let ((i ?0))