mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

* ido.el (ido-file-internal): Fix 2009-12-02 change.

Browse Source
This commit is contained in:
Chong Yidong 2010-04-14 13:32:50 -04:00
parent 7860d2e357
commit 3808c51fa8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2010-04-14 Óscar Fuentes <ofv@wanadoo.es>
* ido.el (ido-file-internal): Fix 2009-12-02 change.
2010-04-14 Christoph <cschol2112@googlemail.com> (tiny change)
* progmodes/grep.el (grep-compute-defaults): Fix handling of host

8
lisp/ido.el
View File

@ -2272,7 +2272,8 @@ If cursor is not at the end of the user input, move to end of input."
(or ido-use-url-at-point ido-use-filename-at-point))
(let (fn d)
(require 'ffap)
;; Duplicate code from ffap-guesser as we want different behavior for files and URLs.
;; Duplicate code from ffap-guesser as we want different
;; behavior for files and URLs.
(cond
((with-no-warnings
(and ido-use-url-at-point
@ -2288,7 +2289,10 @@ If cursor is not at the end of the user input, move to end of input."
(ffap-guesser)
(ffap-string-at-point))))
(not (string-match "^http:/" fn))
(setq d (file-name-directory (expand-file-name fn)))
(let ((absolute-fn (expand-file-name fn)))
(setq d (if (file-directory-p absolute-fn)
(file-name-as-directory absolute-fn)
(file-name-directory absolute-fn))))
(file-directory-p d))
(setq ido-current-directory d)
(setq initial (file-name-nondirectory fn))))))