summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2007-06-20 15:19:37 +0000
committerJuanma Barranquero <lekktu@gmail.com>2007-06-20 15:19:37 +0000
commit72a75b41db354b0846da2c728d3c09f48fb24fc8 (patch)
tree18e39825c68f0083f33c1e88e592d272226b4012
parent43e9fc935faa1120a5b973bbc2a021c20401e782 (diff)
downloademacs-72a75b41db354b0846da2c728d3c09f48fb24fc8.tar.gz
(ido-find-file-in-dir): Don't signal an error for empty directories.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/ido.el3
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bfc5ab7a8e..38f8794f862 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,14 @@
+2007-06-20 Juanma Barranquero <lekktu@gmail.com>
+
+ * ido.el (ido-find-file-in-dir): Don't signal an error for
+ empty directories.
+
2007-06-18 Alan Mackenzie <acm@muc.de>
* progmodes/cc-mode.el (c-remove-any-local-eval-or-mode-variables):
When removing lines, also remove the \n. Correction of patch of
2007-04-21.
-
+
2007-06-17 Glenn Morris <rgm@gnu.org>
* lpr.el (lpr-page-header-switches): Move %s to separate element
@@ -11,8 +16,8 @@
2007-06-13 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> (tiny change)
- * term/xterm.el (terminal-init-xterm): Escape parens in character
- constants.
+ * term/xterm.el (terminal-init-xterm): Escape parens in character
+ constants.
2007-06-12 Ralf Angeli <angeli@caeruleus.net>
diff --git a/lisp/ido.el b/lisp/ido.el
index 5a7be3e5ae6..0808075b495 100644
--- 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