aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/search.texi3
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e23f129a168..b13b3ac1eec 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12010-03-30 Juri Linkov <juri@jurta.org>
2
3 * search.texi (Other Repeating Search): Remove line that `occur'
4 can not handle multiline matches.
5
12010-03-30 Eli Zaretskii <eliz@gnu.org> 62010-03-30 Eli Zaretskii <eliz@gnu.org>
2 7
3 * mule.texi (International): Mention support of bidirectional editing. 8 * mule.texi (International): Mention support of bidirectional editing.
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 8c49a3fa699..890dd48df9f 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1311,8 +1311,7 @@ Prompt for a regexp, and display a list showing each line in the
1311buffer that contains a match for it. To limit the search to part of 1311buffer that contains a match for it. To limit the search to part of
1312the buffer, narrow to that part (@pxref{Narrowing}). A numeric 1312the buffer, narrow to that part (@pxref{Narrowing}). A numeric
1313argument @var{n} specifies that @var{n} lines of context are to be 1313argument @var{n} specifies that @var{n} lines of context are to be
1314displayed before and after each matching line. Currently, 1314displayed before and after each matching line.
1315@code{occur} can not correctly handle multiline matches.
1316 1315
1317@kindex RET @r{(Occur mode)} 1316@kindex RET @r{(Occur mode)}
1318@kindex o @r{(Occur mode)} 1317@kindex o @r{(Occur mode)}