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

set it to a relative directory name either.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 526ae274a439e0193ad5e4f43c5995d40aa13e4d..71c53b0a132c621b7cc223bc513d12f041231d46 100644 (file)
--- 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 4b3ebecb12cf04e4ad87352448cb106628eaece3..c1e61a57fc59daf883925abe003f88317a6c2eb4 100644 (file)
--- 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)