# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1236605382 0
# Node ID 03ed2dba14f66294da339d9aefa90fc02839304a
# Parent  1c91e99dcfe7b81e1812eaddad97125ddf95fe19
(read-file-name): Only split dir name when
default filename is missing.  (Bug#2585)

diff -r 1c91e99dcfe7 -r 03ed2dba14f6 lisp/minibuffer.el
--- a/lisp/minibuffer.el	Mon Mar 09 08:36:54 2009 +0000
+++ b/lisp/minibuffer.el	Mon Mar 09 13:29:42 2009 +0000
@@ -1159,9 +1159,11 @@
                         (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