Commit 9ea3137b authored by Juri Linkov's avatar Juri Linkov

Move recenter/scroll keybindings from minibuffer-local-map to read-char map

* lisp/minibuffer.el (minibuffer-local-map): Move remap of
recenter/scroll keybindings to read-char-from-minibuffer-map.

* lisp/subr.el (read-char-from-minibuffer-map): Move remap of
recenter/scroll keybindings here from minibuffer-local-map.
(bug#38502)
parent fe7ae74c
Pipeline #4272 failed with stage
in 90 minutes and 2 seconds
...@@ -765,9 +765,6 @@ list the contents of such directories when completing file names. ...@@ -765,9 +765,6 @@ list the contents of such directories when completing file names.
** Minibuffer ** Minibuffer
*** Scrolling and recentering commands in the minibuffer are invoked
on the original window (that was selected before activating the minibuffer).
+++ +++
*** A new user option, 'minibuffer-beginning-of-buffer-movement', has *** A new user option, 'minibuffer-beginning-of-buffer-movement', has
been introduced to allow controlling how the 'M-<' command works in been introduced to allow controlling how the 'M-<' command works in
......
...@@ -2244,12 +2244,6 @@ The completion method is determined by `completion-at-point-functions'." ...@@ -2244,12 +2244,6 @@ The completion method is determined by `completion-at-point-functions'."
(define-key map "\C-g" 'abort-recursive-edit) (define-key map "\C-g" 'abort-recursive-edit)
(define-key map "\M-<" 'minibuffer-beginning-of-buffer) (define-key map "\M-<" 'minibuffer-beginning-of-buffer)
(define-key map [remap recenter-top-bottom] 'minibuffer-recenter-top-bottom)
(define-key map [remap scroll-up-command] 'minibuffer-scroll-up-command)
(define-key map [remap scroll-down-command] 'minibuffer-scroll-down-command)
(define-key map [remap scroll-other-window] 'minibuffer-scroll-other-window)
(define-key map [remap scroll-other-window-down] 'minibuffer-scroll-other-window-down)
(define-key map "\r" 'exit-minibuffer) (define-key map "\r" 'exit-minibuffer)
(define-key map "\n" 'exit-minibuffer)) (define-key map "\n" 'exit-minibuffer))
......
...@@ -2672,8 +2672,15 @@ floating point support." ...@@ -2672,8 +2672,15 @@ floating point support."
(defvar read-char-from-minibuffer-map (defvar read-char-from-minibuffer-map
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(set-keymap-parent map minibuffer-local-map) (set-keymap-parent map minibuffer-local-map)
(define-key map [remap self-insert-command]
'read-char-from-minibuffer-insert-char) (define-key map [remap self-insert-command] 'read-char-from-minibuffer-insert-char)
(define-key map [remap recenter-top-bottom] 'minibuffer-recenter-top-bottom)
(define-key map [remap scroll-up-command] 'minibuffer-scroll-up-command)
(define-key map [remap scroll-down-command] 'minibuffer-scroll-down-command)
(define-key map [remap scroll-other-window] 'minibuffer-scroll-other-window)
(define-key map [remap scroll-other-window-down] 'minibuffer-scroll-other-window-down)
map) map)
"Keymap for the `read-char-from-minibuffer' function.") "Keymap for the `read-char-from-minibuffer' function.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment