[Emacs-diffs] /srv/bzr/emacs/trunk r105623: Merge changes from emacs-23 branch

[Chong Yidong]

------------------------------------------------------------
revno: 105623 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-30 18:44:26 -0400
message:
  Merge changes from emacs-23 branch
modified:
  doc/lispref/ChangeLog
  doc/lispref/lists.texi
  src/ChangeLog
  src/syntax.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-08-30 15:24:07 +0000
+++ b/doc/lispref/ChangeLog     2011-08-30 22:43:43 +0000
@@ -1,3 +1,7 @@
+2011-08-30  Dani Moncayo  <address@hidden>  (tiny change)
+
+       * lists.texi (Building Lists): Fix typo.
+
 2011-08-30  Chong Yidong  <address@hidden>
 
        * display.texi (Basic Faces): New node.  Document new faces.

=== modified file 'doc/lispref/lists.texi'
--- a/doc/lispref/lists.texi    2011-05-29 22:41:06 +0000
+++ b/doc/lispref/lists.texi    2011-08-30 22:43:43 +0000
@@ -462,7 +462,7 @@
      @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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-30 18:15:53 +0000
+++ b/src/ChangeLog     2011-08-30 22:43:43 +0000
@@ -1,3 +1,8 @@
+2011-08-30  Chong Yidong  <address@hidden>
+
+       * syntax.c (find_defun_start): Update all cache variables if
+       exiting early (Bug#9401).
+
 2011-08-30  Eli Zaretskii  <address@hidden>
 
        * image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.

=== modified file 'src/syntax.c'
--- a/src/syntax.c      2011-06-24 21:25:22 +0000
+++ b/src/syntax.c      2011-08-30 22:43:43 +0000
@@ -398,7 +398,12 @@
 
   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;
     }