(dired-do-create-files): Construct default file

name for dired-mark-read-file-name so that when the user enters
just RET, the target file will end up in the target directory.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72fced9d7e842f327a4b53849323f9f44355b229..d142f4f80137aabcb2dce4ae791c5c73ac10ee45 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-28  Gerd Moellmann  <gerd@gnu.org>
 
+       * dired-aux.el (dired-do-create-files): Construct default file
+       name for dired-mark-read-file-name so that when the user enters
+       just RET, the target file will end up in the target directory.
+
        * abbrev.el (prepare-abbrev-list-buffer): Get the value of
        local-abbrev-table before changing buffers because it might
        have a buffer-local binding.

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 5097979725bd231e3d7a40648cfc0d8c64df693c..4b9667110128ab8061c07c3fcf9f21c902284911 100644 (file)
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1227,12 +1227,14 @@ Optional arg HOW-TO is used to set the value of the into-dir variable
         (rfn-list (mapcar (function dired-make-relative) fn-list))
         (dired-one-file        ; fluid variable inside dired-create-files
          (and (consp fn-list) (null (cdr fn-list)) (car fn-list)))
+        (target-dir (dired-dwim-target-directory))
+        (default (and dired-one-file
+                      (expand-file-name (file-name-nondirectory (car fn-list))
+                                        target-dir)))
         (target (expand-file-name ; fluid variable inside dired-create-files
                   (dired-mark-read-file-name
                    (concat (if dired-one-file op1 operation) " %s to: ")
-                   (dired-dwim-target-directory)
-                   op-symbol arg rfn-list
-                   (and dired-one-file (car fn-list)))))
+                   target-dir op-symbol arg rfn-list default)))
         (into-dir (cond ((null how-to)
                          ;; Allow DOS/Windows users to change the letter
                          ;; case of a directory.  If we don't test these