(ido-find-file-in-dir): Use `file-name-as-directory'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc63d37234f01b6e35b3ad5f63551ff924972a85..02745e8149af3489cc66e7d062b6ffe9b66f19fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-06-20  Juanma Barranquero  <lekktu@gmail.com>
 
+       * ido.el (ido-find-file-in-dir): Don't signal an error for
+       empty directories.
+
        * add-log.el (change-log-mode): Set `show-trailing-whitespace'.
 
        * desktop.el (desktop-read): Run `desktop-not-loaded-hook' in the

diff --git a/lisp/ido.el b/lisp/ido.el
index 5a7be3e5ae6bef2790aac0931af184c6923dc4d5..0808075b495ee4f8e275832976300f7243aa8a55 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3994,8 +3994,7 @@ For details of keybindings, see `ido-switch-buffer'."
 (defun ido-find-file-in-dir (dir)
   "Switch to another file starting from DIR."
   (interactive "DDir: ")
-  (if (not (equal (substring dir -1) "/"))
-      (setq dir (concat dir "/")))
+  (setq dir (file-name-as-directory dir))
   (ido-file-internal ido-default-file-method nil dir nil nil nil 'ignore))
 
 ;;;###autoload