[patch] ido.el

[Karl Chen]

This patch fixes a bug when default-directory or the given
directory doesn't end in a slash

-- 
Karl Chen 2003-11-28 20:53


Index: ido.el
===================================================================
--- ido.el      (revision 5448)
+++ ido.el      (working copy)
@@ -1372,6 +1372,9 @@
    (fix-it (concat dir "/"))
    (t nil)))
 
+(defsubst ido-directory-or-default (directory)
+  (file-name-as-directory (expand-file-name (or directory default-directory))))
+
 (defun ido-set-current-directory (dir &optional subdir no-merge)
   ;; Set ido's current directory to DIR or DIR/SUBDIR
   (setq dir (ido-final-slash dir t))
@@ -1832,7 +1835,7 @@
 
 (defun ido-file-internal (method &optional fallback default prompt item 
initial)
   ;; Internal function for ido-find-file and friends
-  (let ((ido-current-directory (expand-file-name (or default 
default-directory)))
+  (let ((ido-current-directory (ido-directory-or-default default))
        filename)
 
     (if (or (not ido-mode) (ido-is-slow-ftp-host))
@@ -3725,7 +3728,7 @@
    (let (filename
         ido-saved-vc-mt
         (vc-master-templates (and (boundp 'vc-master-templates) 
vc-master-templates))
-        (ido-current-directory (expand-file-name (or dir default-directory)))
+        (ido-current-directory (ido-directory-or-default dir 
default-directory))
         (ido-work-directory-index -1)
         (ido-work-file-index -1)
         (ido-find-literal nil))
@@ -3743,7 +3746,7 @@
 See `read-file-name' for additional parameters."
   (let (filename
        ido-saved-vc-mt
-       (ido-current-directory (expand-file-name (or dir default-directory)))
+       (ido-current-directory (ido-directory-or-default dir))
        (ido-work-directory-index -1)
        (ido-work-file-index -1))
     (setq filename