aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-10-22 20:21:21 +0000
committerChong Yidong2008-10-22 20:21:21 +0000
commit9c8f194dd66a0067d1f692a667bcc8a5d562b108 (patch)
tree29a51104295ed87142ec17b807c9fb1e5ec32571
parent4133c2148bde7f2d23e7970a8beee6c414e0b4b8 (diff)
downloademacs-9c8f194dd66a0067d1f692a667bcc8a5d562b108.tar.gz
emacs-9c8f194dd66a0067d1f692a667bcc8a5d562b108.zip
(dired-do-create-files): Doc fix.
-rw-r--r--lisp/dired-aux.el41
1 files changed, 17 insertions, 24 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index bf87ce7bbdd..26d5ce4ec67 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1464,7 +1464,7 @@ ESC or `q' to not overwrite any of the remaining files,
1464 how-to) 1464 how-to)
1465 "Create a new file for each marked file. 1465 "Create a new file for each marked file.
1466Prompts user for target, which is a directory in which to create 1466Prompts user for target, which is a directory in which to create
1467 the new files. Target may be a plain file if only one marked 1467 the new files. Target may also be a plain file if only one marked
1468 file exists. The way the default for the target directory is 1468 file exists. The way the default for the target directory is
1469 computed depends on the value of `dired-dwim-target-directory'. 1469 computed depends on the value of `dired-dwim-target-directory'.
1470OP-SYMBOL is the symbol for the operation. Function `dired-mark-pop-up' 1470OP-SYMBOL is the symbol for the operation. Function `dired-mark-pop-up'
@@ -1474,30 +1474,23 @@ ARG as in `dired-get-marked-files'.
1474Optional arg MARKER-CHAR as in `dired-create-files'. 1474Optional arg MARKER-CHAR as in `dired-create-files'.
1475Optional arg OP1 is an alternate form for OPERATION if there is 1475Optional arg OP1 is an alternate form for OPERATION if there is
1476 only one file. 1476 only one file.
1477Optional arg HOW-TO is used to set the value of the into-dir variable 1477Optional arg HOW-TO determiness how to treat the target.
1478 which determines how to treat target. 1478 If HOW-TO is nil, use `file-directory-p' to determine if the
1479 If into-dir is set to nil then target is not regarded as a directory, 1479 target is a directory. If so, the marked file(s) are created
1480 there must be exactly one marked file, else error. 1480 inside that directory. Otherwise, the target is a plain file;
1481 Else if into-dir is set to a list, then target is a generalized 1481 an error is raised unless there is exactly one marked file.
1482 directory (e.g. some sort of archive). The first element of into-dir 1482 If HOW-TO is t, target is always treated as a plain file.
1483 must be a function with at least four arguments: 1483 Otherwise, HOW-TO should be a function of one argument, TARGET.
1484 operation as OPERATION above. 1484 If its return value is nil, TARGET is regarded as a plain file.
1485 rfn-list a list of the relative names for the marked files. 1485 If it return value is a list, TARGET is a generalized
1486 fn-list a list of the absolute names for the marked files. 1486 directory (e.g. some sort of archive). The first element of
1487 target. 1487 this list must be a function with at least four arguments:
1488 operation - as OPERATION above.
1489 rfn-list - list of the relative names for the marked files.
1490 fn-list - list of the absolute names for the marked files.
1491 target - the name of the target itself.
1488 The rest of into-dir are optional arguments. 1492 The rest of into-dir are optional arguments.
1489 Else into-dir is not a list. Target is a directory. 1493 For any other return value, TARGET is treated as a directory."
1490 The marked file(s) are created inside the target directory.
1491
1492 If HOW-TO is not given (or nil), then into-dir is set to true if
1493 target is a directory and otherwise to nil.
1494 Else if HOW-TO is t, then into-dir is set to nil.
1495 Else HOW-TO is assumed to be a function of one argument, target,
1496 that looks at target and returns a value for the into-dir
1497 variable. The function `dired-into-dir-with-symlinks' is provided
1498 for the case (common when creating symlinks) that symbolic
1499 links to directories are not to be considered as directories
1500 (as `file-directory-p' would if HOW-TO had been nil)."
1501 (or op1 (setq op1 operation)) 1494 (or op1 (setq op1 operation))
1502 (let* ((fn-list (dired-get-marked-files nil arg)) 1495 (let* ((fn-list (dired-get-marked-files nil arg))
1503 (rfn-list (mapcar (function dired-make-relative) fn-list)) 1496 (rfn-list (mapcar (function dired-make-relative) fn-list))