From 6462af0deecd3f4a756b66b626f491d160f13494 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Mon, 9 Mar 2009 13:31:23 +0000 Subject: [PATCH] (read-file-name): Only split dir name when default filename is missing. (Bug#2585) --- lisp/ChangeLog | 5 +++++ lisp/minibuffer.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7221622a08c..516eb13bba4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-03-09 Jason Rumney + + * minibuffer.el (read-file-name): Only split dir name when + default filename is missing. (Bug#2585) + 2009-03-08 Chong Yidong * finder.el (finder-commentary): Don't delete other diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 3407477b917..b72259528e6 100644 --- 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 -- 2.39.5