[Emacs-diffs] trunk r113149: * ido.el (ido-read-internal): Fix bug#14620.

[Leo Liu]

------------------------------------------------------------
revno: 113149
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14620
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-24 10:15:56 +0800
message:
  * ido.el (ido-read-internal): Fix bug#14620.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/ido.el                    ido.el-20091113204419-o5vbwnq5f7feedwu-2430

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-23 20:29:18 +0000
+++ b/lisp/ChangeLog    2013-06-24 02:15:56 +0000
@@ -1,3 +1,7 @@
+2013-06-24  Leo Liu  <address@hidden>
+
+       * ido.el (ido-read-internal): Fix bug#14620.
+
 2013-06-23  Juanma Barranquero  <address@hidden>
 
        * faces.el (face-documentation): Simplify.

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2013-06-12 07:54:57 +0000
+++ b/lisp/ido.el       2013-06-24 02:15:56 +0000
@@ -2141,9 +2141,9 @@
                    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))