diff options
| author | Eli Zaretskii | 2001-04-27 15:40:29 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-04-27 15:40:29 +0000 |
| commit | dcaf31d3e411053e0ef157c0289370f5212d8c45 (patch) | |
| tree | f610450b1f741376386f8ab0fd21f6b8351013c2 | |
| parent | a6a0642945fa6f859ade5e8710ce2f99654b2cdb (diff) | |
| download | emacs-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/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/dired-aux.el | 19 |
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 @@ | |||
| 1 | 2001-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 | |||
| 1 | 2001-04-28 Miles Bader <miles@gnu.org> | 7 | 2001-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. |
| 1191 | Prompts user for target, which is a directory in which to create | 1191 | Prompts 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'. | ||
| 1194 | OP-SYMBOL is the symbol for the operation. Function `dired-mark-pop-up' | 1195 | OP-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. |
| 1196 | FILE-CREATOR and OPERATION as in `dired-create-files'. | 1197 | FILE-CREATOR and OPERATION as in `dired-create-files'. |
| @@ -1342,7 +1343,9 @@ This normally preserves the last-modified date when copying. | |||
| 1342 | When operating on just the current file, you specify the new name. | 1343 | When operating on just the current file, you specify the new name. |
| 1343 | When operating on multiple or marked files, you specify a directory, | 1344 | When operating on multiple or marked files, you specify a directory, |
| 1344 | and new copies of these files are made in that directory | 1345 | and new copies of these files are made in that directory |
| 1345 | with the same names that the files currently have." | 1346 | with the same names that the files currently have. The default |
| 1347 | suggested 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." | |||
| 1356 | When operating on just the current file, you specify the new name. | 1359 | When operating on just the current file, you specify the new name. |
| 1357 | When operating on multiple or marked files, you specify a directory | 1360 | When operating on multiple or marked files, you specify a directory |
| 1358 | and new symbolic links are made in that directory | 1361 | and new symbolic links are made in that directory |
| 1359 | with the same names that the files currently have." | 1362 | with the same names that the files currently have. The default |
| 1363 | suggested 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." | |||
| 1367 | When operating on just the current file, you specify the new name. | 1372 | When operating on just the current file, you specify the new name. |
| 1368 | When operating on multiple or marked files, you specify a directory | 1373 | When operating on multiple or marked files, you specify a directory |
| 1369 | and new hard links are made in that directory | 1374 | and new hard links are made in that directory |
| 1370 | with the same names that the files currently have." | 1375 | with the same names that the files currently have. The default |
| 1376 | suggested 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. |
| 1378 | When renaming just the current file, you specify the new name. | 1385 | When renaming just the current file, you specify the new name. |
| 1379 | When renaming multiple or marked files, you specify a directory." | 1386 | When renaming multiple or marked files, you specify a directory. |
| 1387 | The default suggested for the target directory depends on the value | ||
| 1388 | of `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")) |