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

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.48 emacs/lisp/ido.el:1.49
*** emacs/lisp/ido.el:1.48      Wed Feb 16 21:36:41 2005
--- emacs/lisp/ido.el   Thu Mar 31 22:22:45 2005
***************
*** 1935,1953 ****
    ;; Internal function for ido-find-file and friends
    (unless item
      (setq item 'file))
!   (let* ((ido-current-directory (ido-expand-directory default))
!        (ido-directory-nonreadable (ido-nonreadable-directory-p 
ido-current-directory))
!        (ido-directory-too-big (and (not ido-directory-nonreadable)
!                                    (ido-directory-too-big-p 
ido-current-directory)))
!        (ido-context-switch-command switch-cmd)
!        filename)
! 
!     (cond
!      ((or (not ido-mode) (ido-is-slow-ftp-host))
!       (setq filename t
!           ido-exit 'fallback))
  
!      ((and (eq item 'file)
           (or ido-use-url-at-point ido-use-filename-at-point))
        (let (fn d)
        (require 'ffap)
--- 1935,1955 ----
    ;; Internal function for ido-find-file and friends
    (unless item
      (setq item 'file))
!   (let ((ido-current-directory (ido-expand-directory default))
!       (ido-context-switch-command switch-cmd)
!         ido-directory-nonreadable ido-directory-too-big
!       filename)
! 
!     (if (or (not ido-mode) (ido-is-slow-ftp-host))
!       (setq filename t
!             ido-exit 'fallback)
!       (setq ido-directory-nonreadable
!           (ido-nonreadable-directory-p ido-current-directory)
!           ido-directory-too-big
!           (and (not ido-directory-nonreadable)
!                (ido-directory-too-big-p ido-current-directory))))
  
!     (when (and (eq item 'file)
           (or ido-use-url-at-point ido-use-filename-at-point))
        (let (fn d)
        (require 'ffap)
***************
*** 1966,1972 ****
               (setq d (file-name-directory fn))
               (file-directory-p d))
          (setq ido-current-directory d)
!         (setq initial (file-name-nondirectory fn)))))))
  
      (let (ido-saved-vc-hb
          (vc-handled-backends (and (boundp 'vc-handled-backends) 
vc-handled-backends))
--- 1968,1974 ----
               (setq d (file-name-directory fn))
               (file-directory-p d))
          (setq ido-current-directory d)
!         (setq initial (file-name-nondirectory fn))))))
  
      (let (ido-saved-vc-hb
          (vc-handled-backends (and (boundp 'vc-handled-backends) 
vc-handled-backends))