summaryrefslogtreecommitdiff
path: root/lisp/minibuffer.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/minibuffer.el')
-rw-r--r--lisp/minibuffer.el15
1 files changed, 6 insertions, 9 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index d62b377954d..0a2774de572 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2754,15 +2754,12 @@ See `completing-read' for the meaning of the arguments."
base-keymap
;; Layer minibuffer-local-filename-completion-map
;; on top of the base map.
- ;; Use make-composed-keymap so that set-keymap-parent
- ;; doesn't modify minibuffer-local-filename-completion-map.
- (let ((map (make-composed-keymap
- minibuffer-local-filename-completion-map)))
- ;; Set base-keymap as the parent, so that nil bindings
- ;; in minibuffer-local-filename-completion-map can
- ;; override bindings in base-keymap.
- (set-keymap-parent map base-keymap)
- map)))
+ (make-composed-keymap
+ minibuffer-local-filename-completion-map
+ ;; Set base-keymap as the parent, so that nil bindings
+ ;; in minibuffer-local-filename-completion-map can
+ ;; override bindings in base-keymap.
+ base-keymap)))
(result (read-from-minibuffer prompt initial-input keymap
nil hist def inherit-input-method)))
(when (and (equal result "") def)