aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-05-02 22:57:06 +0300
committerEli Zaretskii2016-05-02 22:57:06 +0300
commitec554d7741d2ff2828ecaa437cc26a6e615f1319 (patch)
tree5a09df2b806cd18d1e8e828b44758bcf0b1f7061
parentbf21c84f0d3dab33b4836098b789eaddf9492b2a (diff)
downloademacs-ec554d7741d2ff2828ecaa437cc26a6e615f1319.tar.gz
emacs-ec554d7741d2ff2828ecaa437cc26a6e615f1319.zip
Fix documentation of dired-aux search/replace commands
* lisp/dired-aux.el (dired-do-find-regexp) (dired-do-find-regexp-and-replace): Doc fixes. (Bug#23429) * lisp/dired.el: Update the corresponding autoload forms.
-rw-r--r--lisp/dired-aux.el7
-rw-r--r--lisp/dired.el9
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 08db1877f1a..cef4a96b763 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2719,7 +2719,8 @@ with the command \\[tags-loop-continue]."
2719 2719
2720;;;###autoload 2720;;;###autoload
2721(defun dired-do-find-regexp (regexp) 2721(defun dired-do-find-regexp (regexp)
2722 "Find all matches for REGEXP in all marked files, recursively." 2722 "Find all matches for REGEXP in all marked files.
2723For any marked directory, all of its files are searched recursively."
2723 (interactive "sSearch marked files (regexp): ") 2724 (interactive "sSearch marked files (regexp): ")
2724 (require 'grep) 2725 (require 'grep)
2725 (defvar grep-find-ignored-files) 2726 (defvar grep-find-ignored-files)
@@ -2740,7 +2741,9 @@ with the command \\[tags-loop-continue]."
2740 2741
2741;;;###autoload 2742;;;###autoload
2742(defun dired-do-find-regexp-and-replace (from to) 2743(defun dired-do-find-regexp-and-replace (from to)
2743 "Replace matches of FROM with TO, in all marked files, recursively." 2744 "Replace matches of FROM with TO, in all marked files.
2745For any marked directory, matches in all of its files are replaced,
2746recursively."
2744 (interactive 2747 (interactive
2745 (let ((common 2748 (let ((common
2746 (query-replace-read-args 2749 (query-replace-read-args
diff --git a/lisp/dired.el b/lisp/dired.el
index ab111bed1b1..41525a45595 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3919,7 +3919,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
3919 3919
3920;;; Start of automatically extracted autoloads. 3920;;; Start of automatically extracted autoloads.
3921 3921
3922;;;### (autoloads nil "dired-aux" "dired-aux.el" "6b3eb2080834b976621adc041c42f5cc") 3922;;;### (autoloads nil "dired-aux" "dired-aux.el" "00fe45cfae47cace47cffc09afca6832")
3923;;; Generated autoloads from dired-aux.el 3923;;; Generated autoloads from dired-aux.el
3924 3924
3925(autoload 'dired-diff "dired-aux" "\ 3925(autoload 'dired-diff "dired-aux" "\
@@ -4423,12 +4423,15 @@ with the command \\[tags-loop-continue].
4423\(fn FROM TO &optional DELIMITED)" t nil) 4423\(fn FROM TO &optional DELIMITED)" t nil)
4424 4424
4425(autoload 'dired-do-find-regexp "dired-aux" "\ 4425(autoload 'dired-do-find-regexp "dired-aux" "\
4426Find all matches for REGEXP in all marked files, recursively. 4426Find all matches for REGEXP in all marked files.
4427For any marked directory, all of its files are searched recursively.
4427 4428
4428\(fn REGEXP)" t nil) 4429\(fn REGEXP)" t nil)
4429 4430
4430(autoload 'dired-do-find-regexp-and-replace "dired-aux" "\ 4431(autoload 'dired-do-find-regexp-and-replace "dired-aux" "\
4431Replace matches of FROM with TO, in all marked files, recursively. 4432Replace matches of FROM with TO, in all marked files.
4433For any marked directory, matches in all of its files are replaced,
4434recursively.
4432 4435
4433\(fn FROM TO)" t nil) 4436\(fn FROM TO)" t nil)
4434 4437