diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-08-03 17:40:06 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-08-03 17:40:06 -0400 |
| commit | 640c8776f65beda19e4d4221b1cc2fe7a4b503d0 (patch) | |
| tree | 63db8386b0bb79328e9f4dce9a7efab2373847e4 /lisp/minibuffer.el | |
| parent | 8a10d76c8770781641cc742beb6a2ba653c99e00 (diff) | |
| download | emacs-640c8776f65beda19e4d4221b1cc2fe7a4b503d0.tar.gz | |
* src/keymap.c (Fmake_composed_keymap): Move to subr.el.
* lisp/subr.el (make-composed-keymap): Move from C. Change calling
convention, and improve docstring to bring attention to a subtle point.
* lisp/minibuffer.el (completing-read-default): Adjust accordingly.
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 15 |
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) |