aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-04-30 13:37:00 +0000
committerEli Zaretskii2001-04-30 13:37:00 +0000
commit2b3e941a39654ffe92da96a9374bbb9a5c71f191 (patch)
tree35e2c04584dd0782ddbd64668f43df7708551d1b
parent4691d21ee4eec5292193f870f936bb65481ea40d (diff)
downloademacs-2b3e941a39654ffe92da96a9374bbb9a5c71f191.tar.gz
emacs-2b3e941a39654ffe92da96a9374bbb9a5c71f191.zip
(dired-do-rename-regexp, dired-do-copy-regexp)
(dired-do-hardlink-regexp, dired-do-symlink-regexp): Doc fix.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired-aux.el13
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94afe6c37bb..2313f147808 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-04-30 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * dired-aux.el (dired-do-rename-regexp, dired-do-copy-regexp)
4 (dired-do-hardlink-regexp, dired-do-symlink-regexp): Doc fix.
5
12001-04-30 Gerd Moellmann <gerd@gnu.org> 62001-04-30 Gerd Moellmann <gerd@gnu.org>
2 7
3 * mail/rmail.el (rmail-message-regexp-p): Yet another fix. 8 * mail/rmail.el (rmail-message-regexp-p): Yet another fix.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 4b2fecceade..6651f9c832a 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1466,7 +1466,12 @@ Type SPC or `y' to %s one match, DEL or `n' to skip to next,
1466 1466
1467;;;###autoload 1467;;;###autoload
1468(defun dired-do-rename-regexp (regexp newname &optional arg whole-path) 1468(defun dired-do-rename-regexp (regexp newname &optional arg whole-path)
1469 "Rename marked files containing REGEXP to NEWNAME. 1469 "Rename selected files whose names match REGEXP to NEWNAME.
1470
1471With non-zero prefix argument ARG, the command operates on the next ARG
1472files. Otherwise, it operates on all the marked files, or the current
1473file if none are marked.
1474
1470As each match is found, the user must type a character saying 1475As each match is found, the user must type a character saying
1471 what to do with it. For directions, type \\[help-command] at that time. 1476 what to do with it. For directions, type \\[help-command] at that time.
1472NEWNAME may contain \\=\\<n> or \\& as in `query-replace-regexp'. 1477NEWNAME may contain \\=\\<n> or \\& as in `query-replace-regexp'.
@@ -1481,7 +1486,7 @@ Normally, only the non-directory part of the file name is used and changed."
1481 1486
1482;;;###autoload 1487;;;###autoload
1483(defun dired-do-copy-regexp (regexp newname &optional arg whole-path) 1488(defun dired-do-copy-regexp (regexp newname &optional arg whole-path)
1484 "Copy all marked files containing REGEXP to NEWNAME. 1489 "Copy selected files whose names match REGEXP to NEWNAME.
1485See function `dired-do-rename-regexp' for more info." 1490See function `dired-do-rename-regexp' for more info."
1486 (interactive (dired-mark-read-regexp "Copy")) 1491 (interactive (dired-mark-read-regexp "Copy"))
1487 (let ((dired-recursive-copies nil)) ; No recursive copies. 1492 (let ((dired-recursive-copies nil)) ; No recursive copies.
@@ -1492,7 +1497,7 @@ See function `dired-do-rename-regexp' for more info."
1492 1497
1493;;;###autoload 1498;;;###autoload
1494(defun dired-do-hardlink-regexp (regexp newname &optional arg whole-path) 1499(defun dired-do-hardlink-regexp (regexp newname &optional arg whole-path)
1495 "Hardlink all marked files containing REGEXP to NEWNAME. 1500 "Hardlink selected files whose names match REGEXP to NEWNAME.
1496See function `dired-do-rename-regexp' for more info." 1501See function `dired-do-rename-regexp' for more info."
1497 (interactive (dired-mark-read-regexp "HardLink")) 1502 (interactive (dired-mark-read-regexp "HardLink"))
1498 (dired-do-create-files-regexp 1503 (dired-do-create-files-regexp
@@ -1501,7 +1506,7 @@ See function `dired-do-rename-regexp' for more info."
1501 1506
1502;;;###autoload 1507;;;###autoload
1503(defun dired-do-symlink-regexp (regexp newname &optional arg whole-path) 1508(defun dired-do-symlink-regexp (regexp newname &optional arg whole-path)
1504 "Symlink all marked files containing REGEXP to NEWNAME. 1509 "Symlink selected files whose names match REGEXP to NEWNAME.
1505See function `dired-do-rename-regexp' for more info." 1510See function `dired-do-rename-regexp' for more info."
1506 (interactive (dired-mark-read-regexp "SymLink")) 1511 (interactive (dired-mark-read-regexp "SymLink"))
1507 (dired-do-create-files-regexp 1512 (dired-do-create-files-regexp