diff options
| author | Leo Liu | 2013-06-24 10:15:56 +0800 |
|---|---|---|
| committer | Leo Liu | 2013-06-24 10:15:56 +0800 |
| commit | 6c6268c83d18e1a4268be10064ce4ce86c60004f (patch) | |
| tree | bdec6d65872d2f3be5290028d2e66e13b4476e03 | |
| parent | fa55d2aaa23d5916b87a6980c9606466e07df124 (diff) | |
| download | emacs-6c6268c83d18e1a4268be10064ce4ce86c60004f.tar.gz emacs-6c6268c83d18e1a4268be10064ce4ce86c60004f.zip | |
* ido.el (ido-read-internal): Fix bug#14620.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ido.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 27e2b824953..440f66a9fe1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-24 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * ido.el (ido-read-internal): Fix bug#14620. | ||
| 4 | |||
| 1 | 2013-06-23 Juanma Barranquero <lekktu@gmail.com> | 5 | 2013-06-23 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * faces.el (face-documentation): Simplify. | 7 | * 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." | |||
| 2141 | done t) | 2141 | done t) |
| 2142 | (setq ido-set-default-item t))) | 2142 | (setq ido-set-default-item t))) |
| 2143 | 2143 | ||
| 2144 | ((or (string-match "[/\\][^/\\]" ido-selected) | 2144 | ((if (memq system-type '(windows-nt ms-dos)) |
| 2145 | (and (memq system-type '(windows-nt ms-dos)) | 2145 | (string-match "\\`[a-zA-Z]:\\|[\\][^\\]" ido-selected) |
| 2146 | (string-match "\\`[a-zA-Z]:" ido-selected))) | 2146 | (string-match "/[^/]" ido-selected)) |
| 2147 | (ido-set-current-directory (file-name-directory ido-selected)) | 2147 | (ido-set-current-directory (file-name-directory ido-selected)) |
| 2148 | (setq ido-set-default-item t)) | 2148 | (setq ido-set-default-item t)) |
| 2149 | 2149 | ||