1 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6b8fea964d..06e80db356d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-21  Juri Linkov  <juri@jurta.org>
+
+        Fix message of multi-line occur regexps and multi-buffer header lines.
+        http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00457.html
+
+        * replace.el (occur-1): Don't display regexp if it is longer
+        than window-width.  Use `query-replace-descr' to display regexp.
+        (occur-engine): Don't display regexp in the buffer header for
+        multi-buffer occur.  Display a separate header line with total
+        match count and regexp for multi-buffer occur.
+        Use `query-replace-descr' to display regexp.
+
 2010-03-20  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * net/secrets.el: Fix parenthesis.