aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1998-08-13 23:01:05 +0000
committerRichard M. Stallman1998-08-13 23:01:05 +0000
commit57dabf6b5b3b7207dd08dfacddd23613ee889b43 (patch)
treea9a7112edc471b3fa19773dda09bf3df48fdad77
parentb42099b9ecc08d1f6c621508aa1131373d043b6d (diff)
downloademacs-57dabf6b5b3b7207dd08dfacddd23613ee889b43.tar.gz
emacs-57dabf6b5b3b7207dd08dfacddd23613ee889b43.zip
(dired-do-rename-regexp): Doc fix.
-rw-r--r--lisp/dired-aux.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 175e48cd1fc..7263e544698 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -245,7 +245,7 @@ with a prefix argument."
245 245
246(defun dired-map-dired-file-lines (fun) 246(defun dired-map-dired-file-lines (fun)
247 ;; Perform FUN with point at the end of each non-directory line. 247 ;; Perform FUN with point at the end of each non-directory line.
248 ;; FUN takes one argument, the filename (complete pathname). 248 ;; FUN takes one argument, the absolute filename.
249 (save-excursion 249 (save-excursion
250 (let (file buffer-read-only) 250 (let (file buffer-read-only)
251 (goto-char (point-min)) 251 (goto-char (point-min))
@@ -906,7 +906,7 @@ a prefix arg lets you edit the `ls' switches used for the new listing."
906 906
907(defun dired-relist-entry (file) 907(defun dired-relist-entry (file)
908 ;; Relist the line for FILE, or just add it if it did not exist. 908 ;; Relist the line for FILE, or just add it if it did not exist.
909 ;; FILE must be an absolute pathname. 909 ;; FILE must be an absolute file name.
910 (let (buffer-read-only marker) 910 (let (buffer-read-only marker)
911 ;; If cursor is already on FILE's line delete-region will cause 911 ;; If cursor is already on FILE's line delete-region will cause
912 ;; save-excursion to fail because of floating makers, 912 ;; save-excursion to fail because of floating makers,
@@ -1062,7 +1062,7 @@ Special value `always' suppresses confirmation."
1062;; OPERATION (a capitalized string, e.g. `Copy') describes the 1062;; OPERATION (a capitalized string, e.g. `Copy') describes the
1063;; operation performed. It is used for error logging. 1063;; operation performed. It is used for error logging.
1064 1064
1065;; FN-LIST is the list of files to copy (full absolute pathnames). 1065;; FN-LIST is the list of files to copy (full absolute file names).
1066 1066
1067;; NAME-CONSTRUCTOR returns a newfile for every oldfile, or nil to 1067;; NAME-CONSTRUCTOR returns a newfile for every oldfile, or nil to
1068;; skip. If it skips files for other reasons than a direct user 1068;; skip. If it skips files for other reasons than a direct user
@@ -1299,7 +1299,7 @@ When renaming multiple or marked files, you specify a directory."
1299 ;; ARG as in dired-get-marked-files. 1299 ;; ARG as in dired-get-marked-files.
1300 ;; Matches each marked file against REGEXP and constructs the new 1300 ;; Matches each marked file against REGEXP and constructs the new
1301 ;; filename from NEWNAME (like in function replace-match). 1301 ;; filename from NEWNAME (like in function replace-match).
1302 ;; Optional arg WHOLE-PATH means match/replace the whole pathname 1302 ;; Optional arg WHOLE-PATH means match/replace the whole file name
1303 ;; instead of only the non-directory part of the file. 1303 ;; instead of only the non-directory part of the file.
1304 ;; Optional arg MARKER-CHAR as in dired-create-files. 1304 ;; Optional arg MARKER-CHAR as in dired-create-files.
1305 (let* ((fn-list (dired-get-marked-files nil arg)) 1305 (let* ((fn-list (dired-get-marked-files nil arg))
@@ -1370,9 +1370,9 @@ As each match is found, the user must type a character saying
1370 what to do with it. For directions, type \\[help-command] at that time. 1370 what to do with it. For directions, type \\[help-command] at that time.
1371NEWNAME may contain \\=\\<n> or \\& as in `query-replace-regexp'. 1371NEWNAME may contain \\=\\<n> or \\& as in `query-replace-regexp'.
1372REGEXP defaults to the last regexp used. 1372REGEXP defaults to the last regexp used.
1373With a zero prefix arg, renaming by regexp affects the complete 1373
1374 pathname - usually only the non-directory part of file names is used 1374With a zero prefix arg, renaming by regexp affects the absolute file name.
1375 and changed." 1375Normally, only the non-directory part of the file name is used and changed."
1376 (interactive (dired-mark-read-regexp "Rename")) 1376 (interactive (dired-mark-read-regexp "Rename"))
1377 (dired-do-create-files-regexp 1377 (dired-do-create-files-regexp
1378 (function dired-rename-file) 1378 (function dired-rename-file)
@@ -1645,7 +1645,7 @@ This function takes some pains to conform to `ls -lR' output."
1645 (run-hooks 'dired-after-readin-hook)))))) 1645 (run-hooks 'dired-after-readin-hook))))))
1646 1646
1647(defun dired-tree-lessp (dir1 dir2) 1647(defun dired-tree-lessp (dir1 dir2)
1648 ;; Lexicographic order on pathname components, like `ls -lR': 1648 ;; Lexicographic order on file name components, like `ls -lR':
1649 ;; DIR1 < DIR2 iff DIR1 comes *before* DIR2 in an `ls -lR' listing, 1649 ;; DIR1 < DIR2 iff DIR1 comes *before* DIR2 in an `ls -lR' listing,
1650 ;; i.e., iff DIR1 is a (grand)parent dir of DIR2, 1650 ;; i.e., iff DIR1 is a (grand)parent dir of DIR2,
1651 ;; or DIR1 and DIR2 are in the same parentdir and their last 1651 ;; or DIR1 and DIR2 are in the same parentdir and their last