Merge changes from emacs-23 branch

2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e0f2ad096be..52ec796d6cf 100644
--- 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.
diff --git a/src/syntax.c b/src/syntax.c
index 8c2d5ded21f..3e51099794b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -398,7 +398,12 @@ find_defun_start (EMACS_INT pos, EMACS_INT pos_byte)
 
   if (!open_paren_in_column_0_is_defun_start)
     {
+      find_start_value = BEGV;
       find_start_value_byte = BEGV_BYTE;
+      find_start_buffer = current_buffer;
+      find_start_modiff = MODIFF;
+      find_start_begv = BEGV;
+      find_start_pos = pos;
       return BEGV;
     }