diff options
| author | Kim F. Storm <storm@cua.dk> | 2007-03-29 22:33:22 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2007-03-29 22:33:22 +0000 |
| commit | 523c54f5a719bcd34bf9d8ae793e957c1bd7c30b (patch) | |
| tree | eb1d1f39c4401a109b42935bcc0a003c0f4dba75 /lisp/ido.el | |
| parent | 4740825c2f5fbf8e33889ee718cbe227401f7494 (diff) | |
| download | emacs-523c54f5a719bcd34bf9d8ae793e957c1bd7c30b.tar.gz | |
(ido-read-internal): When reading file or dir, only override
minibuffer-local-filename-completion-map, otherwise only override
minibuffer-local-completion-map.
Diffstat (limited to 'lisp/ido.el')
| -rw-r--r-- | lisp/ido.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 3eef048390e..80ed82c2583 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1940,8 +1940,14 @@ If INITIAL is non-nil, it specifies the initial input string." (if (and ido-matches (eq ido-try-merged-list 'auto)) (setq ido-try-merged-list t)) (let - ((minibuffer-local-completion-map ido-completion-map) - (minibuffer-local-filename-completion-map ido-completion-map) + ((minibuffer-local-completion-map + (if (memq ido-cur-item '(file dir)) + minibuffer-local-completion-map + ido-completion-map)) + (minibuffer-local-filename-completion-map + (if (memq ido-cur-item '(file dir)) + ido-completion-map + minibuffer-local-filename-completion-map)) (max-mini-window-height (or ido-max-window-height (and (boundp 'max-mini-window-height) max-mini-window-height))) (ido-completing-read t) |