* buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's

[bpt/emacs.git] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 1d36373..96327b3 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -271,6 +271,10 @@ reset_buffer (b)
   b->auto_save_file_name = Qnil;
   b->read_only = Qnil;
   b->fieldlist = Qnil;
+
+  /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
+  INITIALIZE_INTERVAL (b, NULL_INTERVAL);
+
   reset_buffer_local_variables(b);
 }
 
@@ -535,13 +539,14 @@ This does not change the name of the visited file (if any).")
   return name;
 }
 
-DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 1, 0,
+DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 2, 0,
   "Return most recently selected buffer other than BUFFER.\n\
-Buffers not visible in windows are preferred to visible buffers.\n\
+Buffers not visible in windows are preferred to visible buffers,\n\
+unless optional second argument VISIBLE-OK is non-nil.\n\
 If no other buffer exists, the buffer `*scratch*' is returned.\n\
 If BUFFER is omitted or nil, some interesting buffer is returned.")
-  (buffer)
-     register Lisp_Object buffer;
+  (buffer, visible_ok)
+     register Lisp_Object buffer, visible_ok;
 {
   register Lisp_Object tail, buf, notsogood, tem;
   notsogood = Qnil;
@@ -553,7 +558,10 @@ If BUFFER is omitted or nil, some interesting buffer is returned.")
        continue;
       if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
        continue;
-      tem = Fget_buffer_window (buf, Qnil);
+      if (NILP (visible_ok))
+       tem = Fget_buffer_window (buf, Qnil);
+      else
+       tem = Qnil;
       if (NILP (tem))
        return buf;
       if (NILP (notsogood))
@@ -725,6 +733,10 @@ with `delete-process'.")
     }
   b->markers = Qnil;
 
+  /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
+  INITIALIZE_INTERVAL (b, NULL_INTERVAL);
+  /* Perhaps we should explicitly free the interval tree here... */
+
   b->name = Qnil;
   BUFFER_FREE (BUF_BEG_ADDR (b));
   b->undo_list = Qnil;