Merge changes from emacs-23 branch

doc/lispref/ChangeLog

@@ -1,3 +1,7 @@
+2011-08-30  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
+
+	* lists.texi (Building Lists): Fix typo.
+
 2011-08-30  Chong Yidong  <cyd@stupidchicken.com>
 
 	* display.texi (Basic Faces): New node.  Document new faces.

doc/lispref/lists.texi

@@ -462,7 +462,7 @@ element is @var{object}.  Compare @code{make-list} with
      @result{} nil
 @end group
 @group
-(setq l (make-list 3 '(a b))
+(setq l (make-list 3 '(a b)))
      @result{} ((a b) (a b) (a b))
 (eq (car l) (cadr l))
      @result{} t

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.

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;
     }