Mercurial > emacs
changeset 65012:70976e57cb56
(ido-enter-matching-directory): Rename from
ido-enter-single-matching-directory. Change 'slash choice to
'only. Add 'first choice.
(ido-exhibit): Adapt to above changes.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 17 Aug 2005 11:17:41 +0000 |
| parents | 381163cb93e2 |
| children | 300c93a25100 |
| files | lisp/ido.el |
| diffstat | 1 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ido.el Wed Aug 17 11:17:19 2005 +0000 +++ b/lisp/ido.el Wed Aug 17 11:17:41 2005 +0000 @@ -688,12 +688,17 @@ :type 'boolean :group 'ido) -(defcustom ido-enter-single-matching-directory 'slash - "*Automatically enter sub-directory if it is the only matching item, if non-nil. -If value is 'slash, only enter if typing final slash, else do it always." +(defcustom ido-enter-matching-directory 'only + "*Additional methods to enter sub-directory of first/only matching item. +If value is 'first, enter first matching sub-directory when typing a slash. +If value is 'only, typing a slash only enters the sub-directory if it is +the only matching item. +If value is t, automatically enter a sub-directory when it is the only +matching item, even without typing a slash." :type '(choice (const :tag "Never" nil) - (const :tag "When typing /" slash) - (other :tag "Always" t)) + (const :tag "Slash enters first directory" first) + (const :tag "Slash enters first and only directory" only) + (other :tag "Always enter unique directory" t)) :group 'ido) (defcustom ido-create-new-buffer 'prompt @@ -3992,12 +3997,13 @@ (ido-set-matches) (ido-trace "new " ido-matches) - (when (and ido-enter-single-matching-directory + (when (and ido-enter-matching-directory ido-matches - (null (cdr ido-matches)) + (or (eq ido-enter-matching-directory 'first) + (null (cdr ido-matches))) (ido-final-slash (car ido-matches)) (or try-single-dir-match - (eq ido-enter-single-matching-directory t))) + (eq ido-enter-matching-directory t))) (ido-trace "single match" (car ido-matches)) (ido-set-current-directory (concat ido-current-directory (car ido-matches)))