aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-02 15:53:53 +0200
committerLars Magne Ingebrigtsen2011-07-02 15:53:53 +0200
commit5cf561436035503121d771d123368b75ae1452b4 (patch)
tree4dcf352b428f36a2a9f6fd463d893c08dfed382c
parent2904fd970fed26de08afa4a1116d7423af180390 (diff)
downloademacs-5cf561436035503121d771d123368b75ae1452b4.tar.gz
emacs-5cf561436035503121d771d123368b75ae1452b4.zip
* replace.el (multi-occur): Mention
`multi-occur-in-matching-buffers' in the doc string. Fixes: debbugs:7566
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/replace.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11e828634f5..05b54ce491a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * replace.el (multi-occur): Mention
4 `multi-occur-in-matching-buffers' in the doc string (bug#7566).
5
12011-07-02 Drew Adams <drew.adams@oracle.com> 62011-07-02 Drew Adams <drew.adams@oracle.com>
2 7
3 * dired.el (dired-mark-if): Make the message about whether it's 8 * dired.el (dired-mark-if): Make the message about whether it's
diff --git a/lisp/replace.el b/lisp/replace.el
index 0578ed09b1c..fb98a714dff 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1140,7 +1140,8 @@ are not modified."
1140 "Show all lines in buffers BUFS containing a match for REGEXP. 1140 "Show all lines in buffers BUFS containing a match for REGEXP.
1141This function acts on multiple buffers; otherwise, it is exactly like 1141This function acts on multiple buffers; otherwise, it is exactly like
1142`occur'. When you invoke this command interactively, you must specify 1142`occur'. When you invoke this command interactively, you must specify
1143the buffer names that you want, one by one." 1143the buffer names that you want, one by one.
1144See also `multi-occur-in-matching-buffers'."
1144 (interactive 1145 (interactive
1145 (cons 1146 (cons
1146 (let* ((bufs (list (read-buffer "First buffer to search: " 1147 (let* ((bufs (list (read-buffer "First buffer to search: "