Merge changes from emacs-23 branch

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index e0f2ad096bebe5f29393caeb3c44549e617d37fd..52ec796d6cf0bca1a171e75dde6486ad9169ec88 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30  Chong Yidong  <cyd@stupidchicken.com>
+
+       * syntax.c (find_defun_start): Update all cache variables if
+       exiting early (Bug#9401).
+
 2011-08-30  Eli Zaretskii  <eliz@gnu.org>
 
        * image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.