[Emacs-diffs] emacs/lisp minibuffer.el

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/03/09 13:29:44

Modified files:
        lisp           : minibuffer.el 

Log message:
        (read-file-name): Only split dir name when 
        default filename is missing.  (Bug#2585)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.71&r2=1.72

Patches:
Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- minibuffer.el       13 Feb 2009 10:35:42 -0000      1.71
+++ minibuffer.el       9 Mar 2009 13:29:42 -0000       1.72
@@ -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