* ido.el (ido-file-internal): Fix 2009-12-02 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2fddcbf1366267e7bb18ef013c89b8c4a412978f..7ba138f310d9d3e224c7f872d555759581ce0a82 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-14  Óscar Fuentes  <ofv@wanadoo.es>
+
+       * ido.el (ido-file-internal): Fix 2009-12-02 change.
+
 2010-04-14  Christoph  <cschol2112@googlemail.com>  (tiny change)
 
        * progmodes/grep.el (grep-compute-defaults): Fix handling of host

diff --git a/lisp/ido.el b/lisp/ido.el
index 48acc50581d73e927a38eaef4d117093a25ad795..6cedccb37875892400da56f8308d1ede57c3330d 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2272,7 +2272,8 @@ If cursor is not at the end of the user input, move to end of input."
           (or ido-use-url-at-point ido-use-filename-at-point))
       (let (fn d)
        (require 'ffap)
-       ;; Duplicate code from ffap-guesser as we want different behavior for files and URLs.
+       ;; Duplicate code from ffap-guesser as we want different
+       ;; behavior for files and URLs.
        (cond
         ((with-no-warnings
            (and ido-use-url-at-point
@@ -2288,7 +2289,10 @@ If cursor is not at the end of the user input, move to end of input."
                              (ffap-guesser)
                            (ffap-string-at-point))))
               (not (string-match "^http:/" fn))
-              (setq d (file-name-directory (expand-file-name 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))))))