[Emacs-diffs] /srv/bzr/emacs/trunk r109190: Swap buffer text indirection counters in Fbuffer_swap_text.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109190
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-23 11:14:58 +0400
message:
  Swap buffer text indirection counters in Fbuffer_swap_text.
  * buffer.c (Fbuffer_swap_text): Swap indirections too.
  This avoids crash reported by Christoph Scholtes at
  http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-07/msg00785.html.
modified:
  src/ChangeLog
  src/buffer.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-22 16:35:15 +0000
+++ b/src/ChangeLog     2012-07-23 07:14:58 +0000
@@ -1,3 +1,10 @@
+2012-07-22  Dmitry Antipov  <address@hidden>
+
+       Swap buffer text indirection counters in Fbuffer_swap_text.
+       * buffer.c (Fbuffer_swap_text): Swap indirections too.
+       This avoids crash reported by Christoph Scholtes at
+       http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-07/msg00785.html.
+
 2012-07-22  Jan Djärv  <address@hidden>
 
        * nsmenu.m (Popdown_data): New struct.

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2012-07-20 16:05:47 +0000
+++ b/src/buffer.c      2012-07-23 07:14:58 +0000
@@ -2145,6 +2145,7 @@
   swapfield (zv_byte, ptrdiff_t);
   eassert (!current_buffer->base_buffer);
   eassert (!other_buffer->base_buffer);
+  swapfield (indirections, ptrdiff_t);
   current_buffer->clip_changed = 1;    other_buffer->clip_changed = 1;
   swapfield (newline_cache, struct region_cache *);
   swapfield (width_run_cache, struct region_cache *);