aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-28 16:43:45 +0000
committerGerd Moellmann2000-11-28 16:43:45 +0000
commit75ab0c79df5e85f5ec97709d0d2bf6b5b8c9dc9d (patch)
tree5a175b75f2da22a4700b33cd9b0d53a9d4b7ce1f
parent0ad0386ebbe9725c6c750d1c2e7d22e57106aa16 (diff)
downloademacs-75ab0c79df5e85f5ec97709d0d2bf6b5b8c9dc9d.tar.gz
emacs-75ab0c79df5e85f5ec97709d0d2bf6b5b8c9dc9d.zip
(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.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dired-aux.el8
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72fced9d7e8..d142f4f8013 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12000-11-28 Gerd Moellmann <gerd@gnu.org> 12000-11-28 Gerd Moellmann <gerd@gnu.org>
2 2
3 * dired-aux.el (dired-do-create-files): Construct default file
4 name for dired-mark-read-file-name so that when the user enters
5 just RET, the target file will end up in the target directory.
6
3 * abbrev.el (prepare-abbrev-list-buffer): Get the value of 7 * abbrev.el (prepare-abbrev-list-buffer): Get the value of
4 local-abbrev-table before changing buffers because it might 8 local-abbrev-table before changing buffers because it might
5 have a buffer-local binding. 9 have a buffer-local binding.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 5097979725b..4b966711012 100644
--- 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
1227 (rfn-list (mapcar (function dired-make-relative) fn-list)) 1227 (rfn-list (mapcar (function dired-make-relative) fn-list))
1228 (dired-one-file ; fluid variable inside dired-create-files 1228 (dired-one-file ; fluid variable inside dired-create-files
1229 (and (consp fn-list) (null (cdr fn-list)) (car fn-list))) 1229 (and (consp fn-list) (null (cdr fn-list)) (car fn-list)))
1230 (target-dir (dired-dwim-target-directory))
1231 (default (and dired-one-file
1232 (expand-file-name (file-name-nondirectory (car fn-list))
1233 target-dir)))
1230 (target (expand-file-name ; fluid variable inside dired-create-files 1234 (target (expand-file-name ; fluid variable inside dired-create-files
1231 (dired-mark-read-file-name 1235 (dired-mark-read-file-name
1232 (concat (if dired-one-file op1 operation) " %s to: ") 1236 (concat (if dired-one-file op1 operation) " %s to: ")
1233 (dired-dwim-target-directory) 1237 target-dir op-symbol arg rfn-list default)))
1234 op-symbol arg rfn-list
1235 (and dired-one-file (car fn-list)))))
1236 (into-dir (cond ((null how-to) 1238 (into-dir (cond ((null how-to)
1237 ;; Allow DOS/Windows users to change the letter 1239 ;; Allow DOS/Windows users to change the letter
1238 ;; case of a directory. If we don't test these 1240 ;; case of a directory. If we don't test these