aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-04-27 15:40:29 +0000
committerEli Zaretskii2001-04-27 15:40:29 +0000
commitdcaf31d3e411053e0ef157c0289370f5212d8c45 (patch)
treef610450b1f741376386f8ab0fd21f6b8351013c2
parenta6a0642945fa6f859ade5e8710ce2f99654b2cdb (diff)
downloademacs-dcaf31d3e411053e0ef157c0289370f5212d8c45.tar.gz
emacs-dcaf31d3e411053e0ef157c0289370f5212d8c45.zip
(dired-do-create-files, dired-do-copy)
(dired-do-symlink, dired-do-hardlink, dired-do-rename): Mention dired-dwim-target in the doc string.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/dired-aux.el19
2 files changed, 20 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6905f0ec8ec..dd809ad19e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12001-04-27 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * dired-aux.el (dired-do-create-files, dired-do-copy)
4 (dired-do-symlink, dired-do-hardlink, dired-do-rename): Mention
5 dired-dwim-target in the doc string.
6
12001-04-28 Miles Bader <miles@gnu.org> 72001-04-28 Miles Bader <miles@gnu.org>
2 8
3 * dabbrev.el (dabbrev--ignore-buffer-p): New function. 9 * dabbrev.el (dabbrev--ignore-buffer-p): New function.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index c4dcae6e4c7..4b2fecceade 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1190,7 +1190,8 @@ ESC or `q' to not overwrite any of the remaining files,
1190 "Create a new file for each marked file. 1190 "Create a new file for each marked file.
1191Prompts user for target, which is a directory in which to create 1191Prompts user for target, which is a directory in which to create
1192 the new files. Target may be a plain file if only one marked 1192 the new files. Target may be a plain file if only one marked
1193 file exists. 1193 file exists. The way the default for the target directory is
1194 computed depends on the value of `dired-dwim-target-directory'.
1194OP-SYMBOL is the symbol for the operation. Function `dired-mark-pop-up' 1195OP-SYMBOL is the symbol for the operation. Function `dired-mark-pop-up'
1195 will determine whether pop-ups are appropriate for this OP-SYMBOL. 1196 will determine whether pop-ups are appropriate for this OP-SYMBOL.
1196FILE-CREATOR and OPERATION as in `dired-create-files'. 1197FILE-CREATOR and OPERATION as in `dired-create-files'.
@@ -1342,7 +1343,9 @@ This normally preserves the last-modified date when copying.
1342When operating on just the current file, you specify the new name. 1343When operating on just the current file, you specify the new name.
1343When operating on multiple or marked files, you specify a directory, 1344When operating on multiple or marked files, you specify a directory,
1344and new copies of these files are made in that directory 1345and new copies of these files are made in that directory
1345with the same names that the files currently have." 1346with the same names that the files currently have. The default
1347suggested for the target directory depends on the value of
1348`dired-dwim-target', which see."
1346 (interactive "P") 1349 (interactive "P")
1347 (let ((dired-recursive-copies dired-recursive-copies)) 1350 (let ((dired-recursive-copies dired-recursive-copies))
1348 (dired-do-create-files 'copy (function dired-copy-file) 1351 (dired-do-create-files 'copy (function dired-copy-file)
@@ -1356,7 +1359,9 @@ with the same names that the files currently have."
1356When operating on just the current file, you specify the new name. 1359When operating on just the current file, you specify the new name.
1357When operating on multiple or marked files, you specify a directory 1360When operating on multiple or marked files, you specify a directory
1358and new symbolic links are made in that directory 1361and new symbolic links are made in that directory
1359with the same names that the files currently have." 1362with the same names that the files currently have. The default
1363suggested for the target directory depends on the value of
1364`dired-dwim-target', which see."
1360 (interactive "P") 1365 (interactive "P")
1361 (dired-do-create-files 'symlink (function make-symbolic-link) 1366 (dired-do-create-files 'symlink (function make-symbolic-link)
1362 "Symlink" arg dired-keep-marker-symlink)) 1367 "Symlink" arg dired-keep-marker-symlink))
@@ -1367,7 +1372,9 @@ with the same names that the files currently have."
1367When operating on just the current file, you specify the new name. 1372When operating on just the current file, you specify the new name.
1368When operating on multiple or marked files, you specify a directory 1373When operating on multiple or marked files, you specify a directory
1369and new hard links are made in that directory 1374and new hard links are made in that directory
1370with the same names that the files currently have." 1375with the same names that the files currently have. The default
1376suggested for the target directory depends on the value of
1377`dired-dwim-target', which see."
1371 (interactive "P") 1378 (interactive "P")
1372 (dired-do-create-files 'hardlink (function add-name-to-file) 1379 (dired-do-create-files 'hardlink (function add-name-to-file)
1373 "Hardlink" arg dired-keep-marker-hardlink)) 1380 "Hardlink" arg dired-keep-marker-hardlink))
@@ -1376,7 +1383,9 @@ with the same names that the files currently have."
1376(defun dired-do-rename (&optional arg) 1383(defun dired-do-rename (&optional arg)
1377 "Rename current file or all marked (or next ARG) files. 1384 "Rename current file or all marked (or next ARG) files.
1378When renaming just the current file, you specify the new name. 1385When renaming just the current file, you specify the new name.
1379When renaming multiple or marked files, you specify a directory." 1386When renaming multiple or marked files, you specify a directory.
1387The default suggested for the target directory depends on the value
1388of `dired-dwim-target', which see."
1380 (interactive "P") 1389 (interactive "P")
1381 (dired-do-create-files 'move (function dired-rename-file) 1390 (dired-do-create-files 'move (function dired-rename-file)
1382 "Move" arg dired-keep-marker-rename "Rename")) 1391 "Move" arg dired-keep-marker-rename "Rename"))