(read-file-name): Only split dir name when

default filename is missing.  (Bug#2585)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7221622a08c850ee4042dd20c938ec79cbdcd1a1..516eb13bba4fc99fe59e3856dbeae09a41d3da95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-09  Jason Rumney  <jasonr@gnu.org>
+
+       * minibuffer.el (read-file-name): Only split dir name when
+       default filename is missing.  (Bug#2585)
+
 2009-03-08  Chong Yidong  <cyd@stupidchicken.com>
 
        * finder.el (finder-commentary): Don't delete other

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 3407477b9172b90f326c93537f014500ad0d8e94..b72259528e6630c7ab9b0e9d2c91c4fc410022bc 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1159,9 +1159,11 @@ and `read-file-name-function'."
                         (completing-read prompt 'read-file-name-internal
                                          nil mustmatch insdef 'file-name-history
                                          default-filename)))
-                  ;; If DIR contains a file name, split it.
+                  ;; If DEFAULT-FILENAME not supplied and DIR contains
+                  ;; a file name, split it.
                   (let ((file (file-name-nondirectory dir)))
-                    (when (and default-filename (not (zerop (length file))))
+                    (when (and (not default-filename)
+                              (not (zerop (length file))))
                       (setq default-filename file)
                       (setq dir (file-name-directory dir)))
                     (if default-filename