aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-06-25 09:04:06 +0800
committerLeo Liu2013-06-25 09:04:06 +0800
commitf42d8237f706740d23f03ac8f1f5bc8b5d41afe5 (patch)
tree6043457775db92b66279faa56076a34e429fb764
parente31106e80a607df161daf91890fa4a4c816a0bdb (diff)
downloademacs-f42d8237f706740d23f03ac8f1f5bc8b5d41afe5.tar.gz
emacs-f42d8237f706740d23f03ac8f1f5bc8b5d41afe5.zip
* ido.el (ido-read-internal): Allow forward slash on windows.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ido.el5
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60c1174f06d..41000df890d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-06-25 Leo Liu <sdl.web@gmail.com>
2
3 * ido.el (ido-read-internal): Allow forward slash on windows.
4
12013-06-24 Lars Magne Ingebrigtsen <larsi@gnus.org> 52013-06-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * net/eww.el (eww): Start of strings is \\`, not ^. 7 * net/eww.el (eww): Start of strings is \\`, not ^.
diff --git a/lisp/ido.el b/lisp/ido.el
index daa090d5d6f..4a4ecdcdb1a 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2142,8 +2142,9 @@ If INITIAL is non-nil, it specifies the initial input string."
2142 (setq ido-set-default-item t))) 2142 (setq ido-set-default-item t)))
2143 2143
2144 ((string-match (if (memq system-type '(windows-nt ms-dos)) 2144 ((string-match (if (memq system-type '(windows-nt ms-dos))
2145 "\\`[a-zA-Z]:\\|[\\][^\\]" 2145 "\\`[a-zA-Z]:\\|[/\\][^/\\]"
2146 "/[^/]") ido-selected) 2146 "/[^/]")
2147 ido-selected)
2147 (ido-set-current-directory (file-name-directory ido-selected)) 2148 (ido-set-current-directory (file-name-directory ido-selected))
2148 (setq ido-set-default-item t)) 2149 (setq ido-set-default-item t))
2149 2150