[Emacs-diffs] Changes to emacs/lisp/ido.el

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.72 emacs/lisp/ido.el:1.73
*** emacs/lisp/ido.el:1.72      Mon Aug 15 12:29:54 2005
--- emacs/lisp/ido.el   Wed Aug 17 11:17:41 2005
***************
*** 688,699 ****
    :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."
    :type '(choice (const :tag "Never" nil)
!                (const :tag "When typing /" slash)
!                (other :tag "Always" t))
    :group 'ido)
  
  (defcustom ido-create-new-buffer 'prompt
--- 688,704 ----
    :type 'boolean
    :group 'ido)
  
! (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 "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,4003 ****
        (ido-set-matches)
        (ido-trace "new    " ido-matches)
  
!       (when (and ido-enter-single-matching-directory
                   ido-matches
!                  (null (cdr ido-matches))
                   (ido-final-slash (car ido-matches))
                   (or try-single-dir-match
!                      (eq ido-enter-single-matching-directory t)))
          (ido-trace "single match" (car ido-matches))
          (ido-set-current-directory
           (concat ido-current-directory (car ido-matches)))
--- 3997,4009 ----
        (ido-set-matches)
        (ido-trace "new    " ido-matches)
  
!       (when (and ido-enter-matching-directory
                   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-matching-directory t)))
          (ido-trace "single match" (car ido-matches))
          (ido-set-current-directory
           (concat ido-current-directory (car ido-matches)))