(completion-setup-function): Improve last fix so it doesn't

set it to a relative directory name either.

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 526ae274a43..71c53b0a132 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (completion-setup-function): Improve last fix so it doesn't
+        set it to a relative directory name either.
+
 2007-03-05  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * ps-print.el: Replace some (defvar VAR) by (defvar VAR nil).
diff --git a/lisp/simple.el b/lisp/simple.el
index 4b3ebecb12c..c1e61a57fc5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5088,8 +5088,8 @@ of the minibuffer before point is always the common substring.)")
     ;; so it will get copied into the completion list buffer.
     (if minibuffer-completing-file-name
         (with-current-buffer mainbuf
-          (setq default-directory (or (file-name-directory mbuf-contents)
-                                      default-directory))))
+          (setq default-directory
+                (file-name-directory (expand-file-name mbuf-contents)))))
     (with-current-buffer standard-output
       (completion-list-mode)
       (set (make-local-variable 'completion-reference-buffer) mainbuf)