Commit d556ebf9 authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

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

reset it's buffer pointer to NULL (Bug#12652).
parent f0863a54
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> 2012-10-17 Dmitry Antipov <dmantipov@yandex.ru>
   
Do not verify indirection counters of killed buffers (Bug#12579). Do not verify indirection counters of killed buffers (Bug#12579).
......
...@@ -1881,19 +1881,20 @@ cleaning up all windows currently displaying the buffer to be killed. */) ...@@ -1881,19 +1881,20 @@ cleaning up all windows currently displaying the buffer to be killed. */)
if (b->base_buffer) if (b->base_buffer)
{ {
{ /* Unchain all markers that belong to this indirect buffer. /* Unchain all markers that belong to this indirect buffer.
Don't unchain the markers that belong to the base buffer Don't unchain the markers that belong to the base buffer
or its other indirect buffers. */ or its other indirect buffers. */
struct Lisp_Marker **mp; struct Lisp_Marker **mp = &BUF_MARKERS (b);
for (mp = &BUF_MARKERS (b); *mp; ) while ((m = *mp))
{ {
struct Lisp_Marker *m = *mp; if (m->buffer == b)
if (m->buffer == b) {
m->buffer = NULL;
*mp = m->next; *mp = m->next;
else }
mp = &m->next; else
} mp = &m->next;
} }
} }
else else
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment