* lisp/replace.el: Add "collect" feature to occur.

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8aa0eb..187a36a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-04  Tak Ota  <Takaaki.Ota@am.sony.com>
+
+       * replace.el: Add "collect" feature to occur.
+       (occur-collect-regexp-history): New var.
+       (occur-read-primary-args): Return a replace string for nlines, if needed.
+       (occur): Extend the meaning of nlines.
+
+2010-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/which-func.el (which-func-ff-hook): Log the error message.
+       (which-func-update-1): Distinguish symbols from strings.
+       (which-function): Stay within 80 columns.
+
 2010-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (with-demoted-errors): Distinguish symbols from strings.