Mercurial > emacs
comparison lisp/ido.el @ 90796:4ef881a120fe
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 11 Apr 2007 00:17:47 +0000 |
| parents | c0409ee15cee bcf68ba23417 |
| children | e6fdae9180d4 |
comparison
equal
deleted
inserted
replaced
| 90795:b9182b6a90c9 | 90796:4ef881a120fe |
|---|---|
| 1938 | 1938 |
| 1939 (ido-set-matches) | 1939 (ido-set-matches) |
| 1940 (if (and ido-matches (eq ido-try-merged-list 'auto)) | 1940 (if (and ido-matches (eq ido-try-merged-list 'auto)) |
| 1941 (setq ido-try-merged-list t)) | 1941 (setq ido-try-merged-list t)) |
| 1942 (let | 1942 (let |
| 1943 ((minibuffer-local-completion-map ido-completion-map) | 1943 ((minibuffer-local-completion-map |
| 1944 (minibuffer-local-filename-completion-map ido-completion-map) | 1944 (if (memq ido-cur-item '(file dir)) |
| 1945 minibuffer-local-completion-map | |
| 1946 ido-completion-map)) | |
| 1947 (minibuffer-local-filename-completion-map | |
| 1948 (if (memq ido-cur-item '(file dir)) | |
| 1949 ido-completion-map | |
| 1950 minibuffer-local-filename-completion-map)) | |
| 1945 (max-mini-window-height (or ido-max-window-height | 1951 (max-mini-window-height (or ido-max-window-height |
| 1946 (and (boundp 'max-mini-window-height) max-mini-window-height))) | 1952 (and (boundp 'max-mini-window-height) max-mini-window-height))) |
| 1947 (ido-completing-read t) | 1953 (ido-completing-read t) |
| 1948 (ido-require-match require-match) | 1954 (ido-require-match require-match) |
| 1949 (ido-use-mycompletion-depth (1+ (minibuffer-depth))) | 1955 (ido-use-mycompletion-depth (1+ (minibuffer-depth))) |