(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.

diff --git a/lisp/ido.el b/lisp/ido.el
index 6a66ce0388dd8156d94b16dc6bfed3a50750532c..180e9dbb1c83454bf4ce80b0554a82f495a333bc 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -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)