* lisp/ido.el (ido-file-internal): Don't add the name of an existing

directory twice.

Fixes: debbugs:16747

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32df40bd09401966d4027bfded737b8b880334fa..3f2d7ddc7c4b6a3cc1c9a67c4a27092edec7c1bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-16  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * ido.el (ido-file-internal): Don't add the name of an existing
+       directory twice.  (Bug#16747)
+
 2014-02-16  Glenn Morris  <rgm@gnu.org>
 
        * vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):

diff --git a/lisp/ido.el b/lisp/ido.el
index 52dd3850ce599215898f5358997dd07f08c4d607..6c12894335f7538a11b290107a091ab49a684041 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2375,14 +2375,14 @@ If cursor is not at the end of the user input, move to end of input."
                          (if (eq ido-use-filename-at-point 'guess)
                              (ffap-guesser)
                            (ffap-string-at-point))))
-              (not (string-match "^http:/" fn))
-              (let ((absolute-fn (expand-file-name fn)))
-                (setq d (if (file-directory-p absolute-fn)
-                            (file-name-as-directory absolute-fn)
-                          (file-name-directory absolute-fn))))
-              (file-directory-p d))
-         (setq ido-current-directory d)
-         (setq initial (file-name-nondirectory fn))))))
+              (not (string-match "^http:/" fn)))
+          (let ((absolute-fn (expand-file-name fn)))
+            (cond
+             ((file-directory-p absolute-fn)
+              (setq ido-current-directory (file-name-as-directory absolute-fn)))
+             ((file-directory-p (file-name-directory absolute-fn))
+              (setq ido-current-directory (file-name-directory absolute-fn))
+              (setq initial (file-name-nondirectory absolute-fn)))))))))
 
     (let (ido-saved-vc-hb
          (vc-handled-backends (and (boundp 'vc-handled-backends) vc-handled-backends))