* buffer.c (Fkill_buffer): When unchaining the marker,

reset it's buffer pointer to NULL (Bug#12652).

2 files changed, 18 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bea7c9331db..2f2fa27c3b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2012-10-17  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * buffer.c (Fkill_buffer): When unchaining the marker,
+        reset it's buffer pointer to NULL (Bug#12652).
+
+2012-10-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Do not verify indirection counters of killed buffers (Bug#12579).
         * buffer.h (BUFFER_CHECK_INDIRECTION): New macro.
         * buffer.c (compact_buffer, set_buffer_internal_1): Use it.
diff --git a/src/buffer.c b/src/buffer.c
index 8e77db66d43..0b3dde27968 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1881,19 +1881,20 @@ cleaning up all windows currently displaying the buffer to be killed. */)
 
   if (b->base_buffer)
     {
-      { /* Unchain all markers that belong to this indirect buffer.
-           Don't unchain the markers that belong to the base buffer
-           or its other indirect buffers.  */
-        struct Lisp_Marker **mp;
-        for (mp = &BUF_MARKERS (b); *mp; )
-          {
-            struct Lisp_Marker *m = *mp;
-            if (m->buffer == b)
+      /* Unchain all markers that belong to this indirect buffer.
+         Don't unchain the markers that belong to the base buffer
+         or its other indirect buffers.  */
+      struct Lisp_Marker **mp = &BUF_MARKERS (b);
+      while ((m = *mp))
+        {
+          if (m->buffer == b)
+            {
+              m->buffer = NULL;
               *mp = m->next;
-            else
-              mp = &m->next;
-          }
-      }
+            }
+          else
+            mp = &m->next;
+        }
     }
   else
     {