* ido.el (ido-read-internal): Fix bug#14620.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27e2b824953e7a8bffe025ec772bb6a9c89f2fad..440f66a9fe1052c91b1e15099645ea9b3aa8f182 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-24  Leo Liu  <sdl.web@gmail.com>
+
+       * ido.el (ido-read-internal): Fix bug#14620.
+
 2013-06-23  Juanma Barranquero  <lekktu@gmail.com>
 
        * faces.el (face-documentation): Simplify.

diff --git a/lisp/ido.el b/lisp/ido.el
index 47c05b080f783203105f5b5a97588180f5deb54e..78d0112f4c4dc0295643afefdf1bc21bbb82cc36 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2141,9 +2141,9 @@ If INITIAL is non-nil, it specifies the initial input string."
                    done t)
            (setq ido-set-default-item t)))
 
-        ((or (string-match "[/\\][^/\\]" ido-selected)
-             (and (memq system-type '(windows-nt ms-dos))
-                  (string-match "\\`[a-zA-Z]:" ido-selected)))
+        ((if (memq system-type '(windows-nt ms-dos))
+             (string-match "\\`[a-zA-Z]:\\|[\\][^\\]" ido-selected)
+           (string-match "/[^/]" ido-selected))
          (ido-set-current-directory (file-name-directory ido-selected))
          (setq ido-set-default-item t))