* buffer.c (Fkill_buffer): When killing an indirect buffer,

re-attach intervals to its base buffer (Bug#16502).
* intervals.c (set_interval_object): Move from here...
* intervals.h (set_interval_object): ... to here.  Fix comments.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/intervals.h b/src/intervals.h
index 45c2e5f5e54..e901f99747d 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -134,6 +134,14 @@ struct interval
    or pointer slots of struct interval.  */
 
 INLINE void
+set_interval_object (INTERVAL i, Lisp_Object obj)
+{
+  eassert (BUFFERP (obj) || STRINGP (obj));
+  i->up_obj = 1;
+  i->up.obj = obj;
+}
+
+INLINE void
 set_interval_parent (INTERVAL i, INTERVAL parent)
 {
   i->up_obj = false;