From: Leo Liu <sdl.web@gmail.com>
Date: Mon, 24 Jun 2013 02:15:56 +0000 (+0800)
Subject: * ido.el (ido-read-internal): Fix bug#14620.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1992^2~65
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c6268c83d18e1a4268be10064ce4ce86c60004f;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27e2b824953..440f66a9fe1 100644
--- 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 47c05b080f7..78d0112f4c4 100644
--- 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))