mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-23 21:37:34 +00:00
(ido-read-internal): Fix call to read-file-name for edit.
Must expand directory for completion to work; and don't mess with process-environment.
This commit is contained in:
parent
bdcc01de44
commit
3f2b52ad64
1 changed files with 4 additions and 3 deletions
|
|
@ -1667,8 +1667,7 @@ If INITIAL is non-nil, it specifies the initial input string."
|
|||
((memq ido-exit '(edit chdir))
|
||||
(cond
|
||||
((memq ido-cur-item '(file dir))
|
||||
(let* ((process-environment (cons "HOME=/" process-environment)) ;; cheat read-file-name
|
||||
(read-file-name-function nil)
|
||||
(let* ((read-file-name-function nil)
|
||||
(edit (eq ido-exit 'edit))
|
||||
(d ido-current-directory)
|
||||
(f ido-text-init)
|
||||
|
|
@ -1676,7 +1675,9 @@ If INITIAL is non-nil, it specifies the initial input string."
|
|||
(setq ido-text-init "")
|
||||
(while new
|
||||
(setq new (if edit
|
||||
(read-file-name (concat prompt "[EDIT] ") d (concat d f) nil f)
|
||||
(read-file-name (concat prompt "[EDIT] ")
|
||||
(expand-file-name d)
|
||||
(concat d f) nil f)
|
||||
f)
|
||||
d (or (file-name-directory new) "/")
|
||||
f (file-name-nondirectory new)
|
||||
|
|
|
|||
Loading…
Reference in a new issue