Mercurial > emacs
comparison lisp/ido.el @ 90054:f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
Update from CVS: src/indent.c (Fvertical_motion): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 08 Dec 2004 05:02:30 +0000 |
parents | e24e2e78deda 1708184cc8da |
children | 3ebd9bdb4fe5 |
comparison
equal
deleted
inserted
replaced
90053:fff5f1a61d92 | 90054:f2ebccfa87d4 |
---|---|
1761 (unless (ido-is-root-directory) | 1761 (unless (ido-is-root-directory) |
1762 (ido-set-current-directory (file-name-directory (substring ido-current-directory 0 -1))) | 1762 (ido-set-current-directory (file-name-directory (substring ido-current-directory 0 -1))) |
1763 (setq ido-set-default-item t)))) | 1763 (setq ido-set-default-item t)))) |
1764 | 1764 |
1765 ;; Handling the require-match must be done in a better way. | 1765 ;; Handling the require-match must be done in a better way. |
1766 ((and require-match (not (ido-existing-item-p))) | 1766 ((and require-match |
1767 (not (if ido-directory-too-big | |
1768 (file-exists-p (concat ido-current-directory ido-final-text)) | |
1769 (ido-existing-item-p)))) | |
1767 (error "must specify valid item")) | 1770 (error "must specify valid item")) |
1768 | 1771 |
1769 (t | 1772 (t |
1770 (setq ido-selected | 1773 (setq ido-selected |
1771 (if (or (eq ido-exit 'takeprompt) | 1774 (if (or (eq ido-exit 'takeprompt) |