aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Rogers2010-12-04 20:01:23 -0500
committerChong Yidong2010-12-04 20:01:23 -0500
commitac73d955823410273066d923287f341cb6fa8a44 (patch)
tree8c49a252749c09a776e952ebe547628f0b7cbe45
parentd96c83fa5638f85d2657d86ac777ec079a2a6573 (diff)
downloademacs-ac73d955823410273066d923287f341cb6fa8a44.tar.gz
emacs-ac73d955823410273066d923287f341cb6fa8a44.zip
* lisp/vc/vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/vc-dir.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c17db89eb81..650d7a097b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-12-05 Bob Rogers <rogers-emacs@rgrjr.dyndns.org>
2
3 * vc/vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501).
4
12010-12-04 Chong Yidong <cyd@stupidchicken.com> 52010-12-04 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * dired.el (dired-use-ls-dired): Set default to a special 7 * dired.el (dired-use-ls-dired): Set default to a special
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 4397251959d..cd40468199f 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -753,12 +753,11 @@ To continue searching for next match, use command \\[tags-loop-continue]."
753 753
754(defun vc-dir-query-replace-regexp (from to &optional delimited) 754(defun vc-dir-query-replace-regexp (from to &optional delimited)
755 "Do `query-replace-regexp' of FROM with TO, on all marked files. 755 "Do `query-replace-regexp' of FROM with TO, on all marked files.
756For marked directories, use the files displayed from those directories.
757If a directory is marked, then use the files displayed for that directory. 756If a directory is marked, then use the files displayed for that directory.
758Third arg DELIMITED (prefix arg) means replace only word-delimited matches. 757Third arg DELIMITED (prefix arg) means replace only word-delimited matches.
759If you exit (\\[keyboard-quit], RET or q), you can resume the query replace 758If you exit (\\[keyboard-quit], RET or q), you can resume the query replace
760with the command \\[tags-loop-continue]." 759with the command \\[tags-loop-continue]."
761 ;; FIXME: this is almost a copy of `dired-do-replace-regexp'. This 760 ;; FIXME: this is almost a copy of `dired-do-query-replace-regexp'. This
762 ;; should probably be made generic and used in both places instead of 761 ;; should probably be made generic and used in both places instead of
763 ;; duplicating it here. 762 ;; duplicating it here.
764 (interactive 763 (interactive