Fix bug ref

[gnu-emacs] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 9373e3cd363bb321e1dc176304026a3fa2d6167f..356a308fce6339118c810ab1c1534d42aa9a6281 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -26,7 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>

-#include <setjmp.h>

 #include <unistd.h>
 
 #include <verify.h>
 #include <unistd.h>
 
 #include <verify.h>


@@ -44,7 +43,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keymap.h"
 #include "frame.h"
 
 #include "keymap.h"
 #include "frame.h"
 

-struct buffer *current_buffer;         /* the current buffer */
+struct buffer *current_buffer;         /* The current buffer.  */

 
 /* First buffer in chain of all buffers (in reverse order of creation).
    Threaded through ->header.next.buffer.  */
 
 /* First buffer in chain of all buffers (in reverse order of creation).
    Threaded through ->header.next.buffer.  */


@@ -60,10 +59,6 @@ struct buffer *all_buffers;
 
 struct buffer alignas (GCALIGNMENT) buffer_defaults;
 
 
 struct buffer alignas (GCALIGNMENT) buffer_defaults;
 

-/* A Lisp_Object pointer to the above, used for staticpro */
-
-static Lisp_Object Vbuffer_defaults;
-

 /* This structure marks which slots in a buffer have corresponding
    default values in buffer_defaults.
    Each such slot has a nonzero value in this structure.
 /* This structure marks which slots in a buffer have corresponding
    default values in buffer_defaults.
    Each such slot has a nonzero value in this structure.


@@ -78,18 +73,15 @@ static Lisp_Object Vbuffer_defaults;
    and the corresponding slot in buffer_defaults is not used.
 
    If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
    and the corresponding slot in buffer_defaults is not used.
 
    If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is

-   zero, that is a bug */
+   zero, that is a bug.  */

 
 struct buffer buffer_local_flags;
 
 /* This structure holds the names of symbols whose values may be
 
 struct buffer buffer_local_flags;
 
 /* This structure holds the names of symbols whose values may be

-   buffer-local.  It is indexed and accessed in the same way as the above. */
+   buffer-local.  It is indexed and accessed in the same way as the above.  */

 
 struct buffer alignas (GCALIGNMENT) buffer_local_symbols;
 
 
 struct buffer alignas (GCALIGNMENT) buffer_local_symbols;
 

-/* A Lisp_Object pointer to the above, used for staticpro */
-static Lisp_Object Vbuffer_local_symbols;
-

 /* Return the symbol of the per-buffer variable at offset OFFSET in
    the buffer structure.  */
 
 /* Return the symbol of the per-buffer variable at offset OFFSET in
    the buffer structure.  */
 


@@ -110,12 +102,12 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
 int last_per_buffer_idx;
 
 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
 int last_per_buffer_idx;
 
 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,

-                                    int after, Lisp_Object arg1,
+                                    bool after, Lisp_Object arg1,

                                     Lisp_Object arg2, Lisp_Object arg3);
 static void swap_out_buffer_local_variables (struct buffer *b);
                                     Lisp_Object arg2, Lisp_Object arg3);
 static void swap_out_buffer_local_variables (struct buffer *b);

-static void reset_buffer_local_variables (struct buffer *b, int permanent_too);
+static void reset_buffer_local_variables (struct buffer *, bool);

 
 

-/* Alist of all buffer names vs the buffers. */
+/* Alist of all buffer names vs the buffers.  */

 /* This used to be a variable, but is no longer,
  to prevent lossage due to user rplac'ing this alist or its elements.  */
 Lisp_Object Vbuffer_alist;
 /* This used to be a variable, but is no longer,
  to prevent lossage due to user rplac'ing this alist or its elements.  */
 Lisp_Object Vbuffer_alist;


@@ -134,7 +126,7 @@ static Lisp_Object Qpermanent_local_hook;
 
 static Lisp_Object Qprotected_field;
 
 
 static Lisp_Object Qprotected_field;
 

-static Lisp_Object QSFundamental;      /* A string "Fundamental" */
+static Lisp_Object QSFundamental;      /* A string "Fundamental".  */

 
 static Lisp_Object Qkill_buffer_hook;
 static Lisp_Object Qbuffer_list_update_hook;
 
 static Lisp_Object Qkill_buffer_hook;
 static Lisp_Object Qbuffer_list_update_hook;


@@ -155,7 +147,7 @@ static void alloc_buffer_text (struct buffer *, ptrdiff_t);
 static void free_buffer_text (struct buffer *b);
 static struct Lisp_Overlay * copy_overlays (struct buffer *, struct Lisp_Overlay *);
 static void modify_overlay (struct buffer *, ptrdiff_t, ptrdiff_t);
 static void free_buffer_text (struct buffer *b);
 static struct Lisp_Overlay * copy_overlays (struct buffer *, struct Lisp_Overlay *);
 static void modify_overlay (struct buffer *, ptrdiff_t, ptrdiff_t);

-static Lisp_Object buffer_lisp_local_variables (struct buffer *, int);
+static Lisp_Object buffer_lisp_local_variables (struct buffer *, bool);

 
 /* These setters are used only in this file, so they can be private.  */
 static inline void
 
 /* These setters are used only in this file, so they can be private.  */
 static inline void


@@ -395,7 +387,7 @@ DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0,
 Value is nil if OBJECT is not a buffer or if it has been killed.  */)
   (Lisp_Object object)
 {
 Value is nil if OBJECT is not a buffer or if it has been killed.  */)
   (Lisp_Object object)
 {

-  return ((BUFFERP (object) && ! NILP (BVAR (XBUFFER (object), name)))
+  return ((BUFFERP (object) && BUFFER_LIVE_P (XBUFFER (object)))

          ? Qt : Qnil);
 }
 
          ? Qt : Qnil);
 }
 


@@ -558,11 +550,11 @@ even if it is dead.  The return value is never nil.  */)
   b->indirections = 0;
 
   BUF_GAP_SIZE (b) = 20;
   b->indirections = 0;
 
   BUF_GAP_SIZE (b) = 20;

-  BLOCK_INPUT;
+  block_input ();

   /* We allocate extra 1-byte at the tail and keep it always '\0' for
      anchoring a search.  */
   alloc_buffer_text (b, BUF_GAP_SIZE (b) + 1);
   /* We allocate extra 1-byte at the tail and keep it always '\0' for
      anchoring a search.  */
   alloc_buffer_text (b, BUF_GAP_SIZE (b) + 1);

-  UNBLOCK_INPUT;
+  unblock_input ();

   if (! BUF_BEG_ADDR (b))
     buffer_memory_full (BUF_GAP_SIZE (b) + 1);
 
   if (! BUF_BEG_ADDR (b))
     buffer_memory_full (BUF_GAP_SIZE (b) + 1);
 


@@ -595,10 +587,6 @@ even if it is dead.  The return value is never nil.  */)
   bset_width_table (b, Qnil);
   b->prevent_redisplay_optimizations_p = 1;
 
   bset_width_table (b, Qnil);
   b->prevent_redisplay_optimizations_p = 1;
 

-  /* Put this on the chain of all buffers including killed ones.  */
-  b->header.next.buffer = all_buffers;
-  all_buffers = b;
-

   /* An ordinary buffer normally doesn't need markers
      to handle BEGV and ZV.  */
   bset_pt_marker (b, Qnil);
   /* An ordinary buffer normally doesn't need markers
      to handle BEGV and ZV.  */
   bset_pt_marker (b, Qnil);


@@ -695,7 +683,7 @@ clone_per_buffer_values (struct buffer *from, struct buffer *to)
       if (offset == PER_BUFFER_VAR_OFFSET (name))
        continue;
 
       if (offset == PER_BUFFER_VAR_OFFSET (name))
        continue;
 

-      obj = PER_BUFFER_VALUE (from, offset);
+      obj = per_buffer_value (from, offset);

       if (MARKERP (obj) && XMARKER (obj)->buffer == from)
        {
          struct Lisp_Marker *m = XMARKER (obj);
       if (MARKERP (obj) && XMARKER (obj)->buffer == from)
        {
          struct Lisp_Marker *m = XMARKER (obj);


@@ -704,7 +692,7 @@ clone_per_buffer_values (struct buffer *from, struct buffer *to)
          XMARKER (obj)->insertion_type = m->insertion_type;
        }
 
          XMARKER (obj)->insertion_type = m->insertion_type;
        }
 

-      PER_BUFFER_VALUE (to, offset) = obj;
+      set_per_buffer_value (to, offset, obj);

     }
 
   memcpy (to->local_flags, from->local_flags, sizeof to->local_flags);
     }
 
   memcpy (to->local_flags, from->local_flags, sizeof to->local_flags);


@@ -787,7 +775,7 @@ CLONE nil means the indirect buffer's state is reset to default values.  */)
   base_buffer = Fget_buffer (base_buffer);
   if (NILP (base_buffer))
     error ("No such buffer: `%s'", SDATA (tem));
   base_buffer = Fget_buffer (base_buffer);
   if (NILP (base_buffer))
     error ("No such buffer: `%s'", SDATA (tem));

-  if (NILP (BVAR (XBUFFER (base_buffer), name)))
+  if (!BUFFER_LIVE_P (XBUFFER (base_buffer)))

     error ("Base buffer has been killed");
 
   if (SCHARS (name) == 0)
     error ("Base buffer has been killed");
 
   if (SCHARS (name) == 0)


@@ -819,10 +807,6 @@ CLONE nil means the indirect buffer's state is reset to default values.  */)
   b->width_run_cache = 0;
   bset_width_table (b, Qnil);
 
   b->width_run_cache = 0;
   bset_width_table (b, Qnil);
 

-  /* Put this on the chain of all buffers including killed ones.  */
-  b->header.next.buffer = all_buffers;
-  all_buffers = b;
-

   name = Fcopy_sequence (name);
   set_string_intervals (name, NULL);
   bset_name (b, name);
   name = Fcopy_sequence (name);
   set_string_intervals (name, NULL);
   bset_name (b, name);


@@ -979,15 +963,13 @@ reset_buffer (register struct buffer *b)
    it does not treat permanent locals consistently.
    Instead, use Fkill_all_local_variables.
 
    it does not treat permanent locals consistently.
    Instead, use Fkill_all_local_variables.
 

-   If PERMANENT_TOO is 1, then we reset permanent
-   buffer-local variables.  If PERMANENT_TOO is 0,
-   we preserve those.  */
+   If PERMANENT_TOO, reset permanent buffer-local variables.
+   If not, preserve those.  */

 
 static void
 
 static void

-reset_buffer_local_variables (register struct buffer *b, int permanent_too)
+reset_buffer_local_variables (struct buffer *b, bool permanent_too)

 {
 {

-  register int offset;
-  int i;
+  int offset, i;

 
   /* Reset the major mode to Fundamental, together with all the
      things that depend on the major mode.
 
   /* Reset the major mode to Fundamental, together with all the
      things that depend on the major mode.


@@ -1063,7 +1045,7 @@ reset_buffer_local_variables (register struct buffer *b, int permanent_too)
       if ((idx > 0
           && (permanent_too
               || buffer_permanent_local_flags[idx] == 0)))
       if ((idx > 0
           && (permanent_too
               || buffer_permanent_local_flags[idx] == 0)))

-       PER_BUFFER_VALUE (b, offset) = PER_BUFFER_DEFAULT (offset);
+       set_per_buffer_value (b, offset, per_buffer_default (offset));

     }
 }
 
     }
 }
 


@@ -1239,12 +1221,12 @@ buffer_local_value_1 (Lisp_Object variable, Lisp_Object buffer)
       {
        union Lisp_Fwd *fwd = SYMBOL_FWD (sym);
        if (BUFFER_OBJFWDP (fwd))
       {
        union Lisp_Fwd *fwd = SYMBOL_FWD (sym);
        if (BUFFER_OBJFWDP (fwd))

-         result = PER_BUFFER_VALUE (buf, XBUFFER_OBJFWD (fwd)->offset);
+         result = per_buffer_value (buf, XBUFFER_OBJFWD (fwd)->offset);

        else
          result = Fdefault_value (variable);
        break;
       }
        else
          result = Fdefault_value (variable);
        break;
       }

-    default: abort ();
+    default: emacs_abort ();

     }
 
   return result;
     }
 
   return result;


@@ -1253,14 +1235,14 @@ buffer_local_value_1 (Lisp_Object variable, Lisp_Object buffer)
 /* Return an alist of the Lisp-level buffer-local bindings of
    buffer BUF.  That is, don't include the variables maintained
    in special slots in the buffer object.
 /* Return an alist of the Lisp-level buffer-local bindings of
    buffer BUF.  That is, don't include the variables maintained
    in special slots in the buffer object.

-   If CLONE is zero elements of the form (VAR . unbound) are replaced
+   If not CLONE, replace elements of the form (VAR . unbound)

    by VAR.  */
 
 static Lisp_Object
    by VAR.  */
 
 static Lisp_Object

-buffer_lisp_local_variables (struct buffer *buf, int clone)
+buffer_lisp_local_variables (struct buffer *buf, bool clone)

 {
   Lisp_Object result = Qnil;
 {
   Lisp_Object result = Qnil;

-  register Lisp_Object tail;
+  Lisp_Object tail;

   for (tail = BVAR (buf, local_var_alist); CONSP (tail); tail = XCDR (tail))
     {
       Lisp_Object val, elt;
   for (tail = BVAR (buf, local_var_alist); CONSP (tail); tail = XCDR (tail))
     {
       Lisp_Object val, elt;


@@ -1319,7 +1301,7 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
            && SYMBOLP (PER_BUFFER_SYMBOL (offset)))
          {
            Lisp_Object sym = PER_BUFFER_SYMBOL (offset);
            && SYMBOLP (PER_BUFFER_SYMBOL (offset)))
          {
            Lisp_Object sym = PER_BUFFER_SYMBOL (offset);

-           Lisp_Object val = PER_BUFFER_VALUE (buf, offset);
+           Lisp_Object val = per_buffer_value (buf, offset);

            result = Fcons (EQ (val, Qunbound) ? sym : Fcons (sym, val),
                            result);
          }
            result = Fcons (EQ (val, Qunbound) ? sym : Fcons (sym, val),
                            result);
          }


@@ -1351,21 +1333,23 @@ DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
        1, 1, 0,
        doc: /* Mark current buffer as modified or unmodified according to FLAG.
 A non-nil FLAG means mark the buffer modified.  */)
        1, 1, 0,
        doc: /* Mark current buffer as modified or unmodified according to FLAG.
 A non-nil FLAG means mark the buffer modified.  */)

-  (register Lisp_Object flag)
+  (Lisp_Object flag)

 {
 {

-  register int already;
-  register Lisp_Object fn;
-  Lisp_Object buffer, window;
+  Lisp_Object fn, buffer, window;

 
 #ifdef CLASH_DETECTION
   /* If buffer becoming modified, lock the file.
      If buffer becoming unmodified, unlock the file.  */
 
 
 #ifdef CLASH_DETECTION
   /* If buffer becoming modified, lock the file.
      If buffer becoming unmodified, unlock the file.  */
 

-  fn = BVAR (current_buffer, file_truename);
+  struct buffer *b = current_buffer->base_buffer
+    ? current_buffer->base_buffer
+    : current_buffer;
+
+  fn = BVAR (b, file_truename);

   /* Test buffer-file-name so that binding it to nil is effective.  */
   /* Test buffer-file-name so that binding it to nil is effective.  */

-  if (!NILP (fn) && ! NILP (BVAR (current_buffer, filename)))
+  if (!NILP (fn) && ! NILP (BVAR (b, filename)))

     {
     {

-      already = SAVE_MODIFF < MODIFF;
+      bool already = SAVE_MODIFF < MODIFF;

       if (!already && !NILP (flag))
        lock_file (fn);
       else if (already && NILP (flag))
       if (!already && !NILP (flag))
        lock_file (fn);
       else if (already && NILP (flag))


@@ -1432,7 +1416,7 @@ state of the current buffer.  Use with care.  */)
   /* Test buffer-file-name so that binding it to nil is effective.  */
   if (!NILP (fn) && ! NILP (BVAR (current_buffer, filename)))
     {
   /* Test buffer-file-name so that binding it to nil is effective.  */
   if (!NILP (fn) && ! NILP (BVAR (current_buffer, filename)))
     {

-      int already = SAVE_MODIFF < MODIFF;
+      bool already = SAVE_MODIFF < MODIFF;

       if (!already && !NILP (flag))
        lock_file (fn);
       else if (already && NILP (flag))
       if (!already && !NILP (flag))
        lock_file (fn);
       else if (already && NILP (flag))


@@ -1557,7 +1541,6 @@ list first, followed by the list of all buffers.  If no other buffer
 exists, return the buffer `*scratch*' (creating it if necessary).  */)
   (register Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
 {
 exists, return the buffer `*scratch*' (creating it if necessary).  */)
   (register Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
 {

-  Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);

   Lisp_Object tail, buf, pred;
   Lisp_Object notsogood = Qnil;
 
   Lisp_Object tail, buf, pred;
   Lisp_Object notsogood = Qnil;
 


@@ -1573,7 +1556,7 @@ exists, return the buffer `*scratch*' (creating it if necessary).  */)
     {
       buf = XCAR (tail);
       if (BUFFERP (buf) && !EQ (buf, buffer)
     {
       buf = XCAR (tail);
       if (BUFFERP (buf) && !EQ (buf, buffer)

-         && !NILP (BVAR (XBUFFER (buf), name))
+         && BUFFER_LIVE_P (XBUFFER (buf))

          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' ')
          /* If the frame has a buffer_predicate, disregard buffers that
             don't fit the predicate.  */
          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' ')
          /* If the frame has a buffer_predicate, disregard buffers that
             don't fit the predicate.  */


@@ -1593,7 +1576,7 @@ exists, return the buffer `*scratch*' (creating it if necessary).  */)
     {
       buf = Fcdr (XCAR (tail));
       if (BUFFERP (buf) && !EQ (buf, buffer)
     {
       buf = Fcdr (XCAR (tail));
       if (BUFFERP (buf) && !EQ (buf, buffer)

-         && !NILP (BVAR (XBUFFER (buf), name))
+         && BUFFER_LIVE_P (XBUFFER (buf))

          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' ')
          /* If the frame has a buffer_predicate, disregard buffers that
             don't fit the predicate.  */
          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' ')
          /* If the frame has a buffer_predicate, disregard buffers that
             don't fit the predicate.  */


@@ -1628,7 +1611,6 @@ exists, return the buffer `*scratch*' (creating it if necessary).  */)
 Lisp_Object
 other_buffer_safely (Lisp_Object buffer)
 {
 Lisp_Object
 other_buffer_safely (Lisp_Object buffer)
 {

-  Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);

   Lisp_Object tail, buf;
 
   tail = Vbuffer_alist;
   Lisp_Object tail, buf;
 
   tail = Vbuffer_alist;


@@ -1636,7 +1618,7 @@ other_buffer_safely (Lisp_Object buffer)
     {
       buf = Fcdr (XCAR (tail));
       if (BUFFERP (buf) && !EQ (buf, buffer)
     {
       buf = Fcdr (XCAR (tail));
       if (BUFFERP (buf) && !EQ (buf, buffer)

-         && !NILP (BVAR (XBUFFER (buf), name))
+         && BUFFER_LIVE_P (XBUFFER (buf))

          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' '))
        return buf;
     }
          && (SREF (BVAR (XBUFFER (buf), name), 0) != ' '))
        return buf;
     }


@@ -1676,7 +1658,7 @@ No argument or nil as argument means do this for the current buffer.  */)
 
 /* Truncate undo list and shrink the gap of BUFFER.  */
 
 
 /* Truncate undo list and shrink the gap of BUFFER.  */
 

-int
+void

 compact_buffer (struct buffer *buffer)
 {
   /* Verify indirection counters.  */
 compact_buffer (struct buffer *buffer)
 {
   /* Verify indirection counters.  */


@@ -1718,9 +1700,7 @@ compact_buffer (struct buffer *buffer)
            }
        }
       buffer->text->compact = buffer->text->modiff;
            }
        }
       buffer->text->compact = buffer->text->modiff;

-      return 1;

     }
     }

-  return 0;

 }
 
 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",
 }
 
 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",


@@ -1757,7 +1737,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   b = XBUFFER (buffer);
 
   /* Avoid trouble for buffer already dead.  */
   b = XBUFFER (buffer);
 
   /* Avoid trouble for buffer already dead.  */

-  if (NILP (BVAR (b, name)))
+  if (!BUFFER_LIVE_P (b))

     return Qnil;
 
   /* Query if the buffer is still modified.  */
     return Qnil;
 
   /* Query if the buffer is still modified.  */


@@ -1793,7 +1773,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   }
 
   /* If the hooks have killed the buffer, exit now.  */
   }
 
   /* If the hooks have killed the buffer, exit now.  */

-  if (NILP (BVAR (b, name)))
+  if (!BUFFER_LIVE_P (b))

     return Qt;
 
   /* We have no more questions to ask.  Verify that it is valid
     return Qt;
 
   /* We have no more questions to ask.  Verify that it is valid


@@ -1825,7 +1805,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
       UNGCPRO;
 
       /* Exit if we now have killed the base buffer (Bug#11665).  */
       UNGCPRO;
 
       /* Exit if we now have killed the base buffer (Bug#11665).  */

-      if (NILP (BVAR (b, name)))
+      if (!BUFFER_LIVE_P (b))

        return Qt;
     }
 
        return Qt;
     }
 


@@ -1836,7 +1816,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   replace_buffer_in_windows (buffer);
 
   /* Exit if replacing the buffer in windows has killed our buffer.  */
   replace_buffer_in_windows (buffer);
 
   /* Exit if replacing the buffer in windows has killed our buffer.  */

-  if (NILP (BVAR (b, name)))
+  if (!BUFFER_LIVE_P (b))

     return Qt;
 
   /* Make this buffer not be current.  Exit if it is the sole visible
     return Qt;
 
   /* Make this buffer not be current.  Exit if it is the sole visible


@@ -1869,7 +1849,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
 
   /* Killing buffer processes may run sentinels which may have killed
      our buffer.  */
 
   /* Killing buffer processes may run sentinels which may have killed
      our buffer.  */

-  if (NILP (BVAR (b, name)))
+  if (!BUFFER_LIVE_P (b))

     return Qt;
 
   /* These may run Lisp code and into infinite loops (if someone
     return Qt;
 
   /* These may run Lisp code and into infinite loops (if someone


@@ -1901,7 +1881,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
     }
 
   /* Deleting an auto-save file could have killed our buffer.  */
     }
 
   /* Deleting an auto-save file could have killed our buffer.  */

-  if (NILP (BVAR (b, name)))
+  if (!BUFFER_LIVE_P (b))

     return Qt;
 
   if (b->base_buffer)
     return Qt;
 
   if (b->base_buffer)


@@ -1943,7 +1923,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
 
   bset_name (b, Qnil);
 
 
   bset_name (b, Qnil);
 

-  BLOCK_INPUT;
+  block_input ();

   if (b->base_buffer)
     {
       /* Notify our base buffer that we don't share the text anymore.  */
   if (b->base_buffer)
     {
       /* Notify our base buffer that we don't share the text anymore.  */


@@ -1966,7 +1946,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
       b->width_run_cache = 0;
     }
   bset_width_table (b, Qnil);
       b->width_run_cache = 0;
     }
   bset_width_table (b, Qnil);

-  UNBLOCK_INPUT;
+  unblock_input ();

   bset_undo_list (b, Qnil);
 
   /* Run buffer-list-update-hook.  */
   bset_undo_list (b, Qnil);
 
   /* Run buffer-list-update-hook.  */


@@ -2070,8 +2050,10 @@ the current buffer's major mode.  */)
 
   CHECK_BUFFER (buffer);
 
 
   CHECK_BUFFER (buffer);
 

-  if (STRINGP (BVAR (XBUFFER (buffer), name))
-      && strcmp (SSDATA (BVAR (XBUFFER (buffer), name)), "*scratch*") == 0)
+  if (!BUFFER_LIVE_P (XBUFFER (buffer)))
+    error ("Attempt to set major mode for a dead buffer");
+
+  if (strcmp (SSDATA (BVAR (XBUFFER (buffer), name)), "*scratch*") == 0)

     function = find_symbol_value (intern ("initial-major-mode"));
   else
     {
     function = find_symbol_value (intern ("initial-major-mode"));
   else
     {


@@ -2105,22 +2087,6 @@ DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
   XSETBUFFER (buf, current_buffer);
   return buf;
 }
   XSETBUFFER (buf, current_buffer);
   return buf;
 }

-\f
-/* Set the current buffer to B.
-
-   We previously set windows_or_buffers_changed here to invalidate
-   global unchanged information in beg_unchanged and end_unchanged.
-   This is no longer necessary because we now compute unchanged
-   information on a buffer-basis.  Every action affecting other
-   windows than the selected one requires a select_window at some
-   time, and that increments windows_or_buffers_changed.  */
-
-void
-set_buffer_internal (register struct buffer *b)
-{
-  if (current_buffer != b)
-    set_buffer_internal_1 (b);
-}

 
 /* Set the current buffer to B, and do not set windows_or_buffers_changed.
    This is used by redisplay.  */
 
 /* Set the current buffer to B, and do not set windows_or_buffers_changed.
    This is used by redisplay.  */


@@ -2220,19 +2186,19 @@ ends when the current command terminates.  Use `switch-to-buffer' or
   buffer = Fget_buffer (buffer_or_name);
   if (NILP (buffer))
     nsberror (buffer_or_name);
   buffer = Fget_buffer (buffer_or_name);
   if (NILP (buffer))
     nsberror (buffer_or_name);

-  if (NILP (BVAR (XBUFFER (buffer), name)))
+  if (!BUFFER_LIVE_P (XBUFFER (buffer)))

     error ("Selecting deleted buffer");
   set_buffer_internal (XBUFFER (buffer));
   return buffer;
 }
 
     error ("Selecting deleted buffer");
   set_buffer_internal (XBUFFER (buffer));
   return buffer;
 }
 

-/* Set the current buffer to BUFFER provided it is alive.  */
+/* Set the current buffer to BUFFER provided if it is alive.  */

 
 Lisp_Object
 set_buffer_if_live (Lisp_Object buffer)
 {
 
 Lisp_Object
 set_buffer_if_live (Lisp_Object buffer)
 {

-  if (! NILP (BVAR (XBUFFER (buffer), name)))
-    Fset_buffer (buffer);
+  if (BUFFER_LIVE_P (XBUFFER (buffer)))
+    set_buffer_internal (XBUFFER (buffer));

   return Qnil;
 }
 \f
   return Qnil;
 }
 \f


@@ -2326,7 +2292,7 @@ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text,
   CHECK_BUFFER (buffer);
   other_buffer = XBUFFER (buffer);
 
   CHECK_BUFFER (buffer);
   other_buffer = XBUFFER (buffer);
 

-  if (NILP (BVAR (other_buffer, name)))
+  if (!BUFFER_LIVE_P (other_buffer))

     error ("Cannot swap a dead buffer's text");
 
   /* Actually, it probably works just fine.
     error ("Cannot swap a dead buffer's text");
 
   /* Actually, it probably works just fine.


@@ -2471,8 +2437,8 @@ current buffer is cleared.  */)
   struct Lisp_Marker *tail, *markers;
   struct buffer *other;
   ptrdiff_t begv, zv;
   struct Lisp_Marker *tail, *markers;
   struct buffer *other;
   ptrdiff_t begv, zv;

-  int narrowed = (BEG != BEGV || Z != ZV);
-  int modified_p = !NILP (Fbuffer_modified_p (Qnil));
+  bool narrowed = (BEG != BEGV || Z != ZV);
+  bool modified_p = !NILP (Fbuffer_modified_p (Qnil));

   Lisp_Object old_undo = BVAR (current_buffer, undo_list);
   struct gcpro gcpro1;
 
   Lisp_Object old_undo = BVAR (current_buffer, undo_list);
   struct gcpro gcpro1;
 


@@ -2693,7 +2659,7 @@ current buffer is cleared.  */)
       /* Make sure no markers were put on the chain
         while the chain value was incorrect.  */
       if (BUF_MARKERS (current_buffer))
       /* Make sure no markers were put on the chain
         while the chain value was incorrect.  */
       if (BUF_MARKERS (current_buffer))

-       abort ();
+       emacs_abort ();

 
       BUF_MARKERS (current_buffer) = markers;
 
 
       BUF_MARKERS (current_buffer) = markers;
 


@@ -2722,7 +2688,7 @@ current buffer is cleared.  */)
   /* Copy this buffer's new multibyte status
      into all of its indirect buffers.  */
   FOR_EACH_BUFFER (other)
   /* Copy this buffer's new multibyte status
      into all of its indirect buffers.  */
   FOR_EACH_BUFFER (other)

-    if (other->base_buffer == current_buffer && !NILP (BVAR (other, name)))
+    if (other->base_buffer == current_buffer && BUFFER_LIVE_P (other))

       {
        BVAR (other, enable_multibyte_characters)
          = BVAR (current_buffer, enable_multibyte_characters);
       {
        BVAR (other, enable_multibyte_characters)
          = BVAR (current_buffer, enable_multibyte_characters);


@@ -2821,19 +2787,19 @@ swap_out_buffer_local_variables (struct buffer *b)
    *VEC_PTR and *LEN_PTR should contain a valid vector and size
    when this function is called.
 
    *VEC_PTR and *LEN_PTR should contain a valid vector and size
    when this function is called.
 

-   If EXTEND is non-zero, we make the vector bigger if necessary.
-   If EXTEND is zero, we never extend the vector,
-   and we store only as many overlays as will fit.
-   But we still return the total number of overlays.
+   If EXTEND, make the vector bigger if necessary.
+   If not, never extend the vector,
+   and store only as many overlays as will fit.
+   But still return the total number of overlays.

 
 

-   If CHANGE_REQ is true, then any position written into *PREV_PTR or
+   If CHANGE_REQ, any position written into *PREV_PTR or

    *NEXT_PTR is guaranteed to be not equal to POS, unless it is the
    default (BEGV or ZV).  */
 
 ptrdiff_t
    *NEXT_PTR is guaranteed to be not equal to POS, unless it is the
    default (BEGV or ZV).  */
 
 ptrdiff_t

-overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr,
+overlays_at (EMACS_INT pos, bool extend, Lisp_Object **vec_ptr,

             ptrdiff_t *len_ptr,
             ptrdiff_t *len_ptr,

-            ptrdiff_t *next_ptr, ptrdiff_t *prev_ptr, int change_req)
+            ptrdiff_t *next_ptr, ptrdiff_t *prev_ptr, bool change_req)

 {
   Lisp_Object overlay, start, end;
   struct Lisp_Overlay *tail;
 {
   Lisp_Object overlay, start, end;
   struct Lisp_Overlay *tail;


@@ -2842,7 +2808,7 @@ overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr,
   Lisp_Object *vec = *vec_ptr;
   ptrdiff_t next = ZV;
   ptrdiff_t prev = BEGV;
   Lisp_Object *vec = *vec_ptr;
   ptrdiff_t next = ZV;
   ptrdiff_t prev = BEGV;

-  int inhibit_storing = 0;
+  bool inhibit_storing = 0;

 
   for (tail = current_buffer->overlays_before; tail; tail = tail->next)
     {
 
   for (tail = current_buffer->overlays_before; tail; tail = tail->next)
     {


@@ -2959,13 +2925,13 @@ overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr,
    *VEC_PTR and *LEN_PTR should contain a valid vector and size
    when this function is called.
 
    *VEC_PTR and *LEN_PTR should contain a valid vector and size
    when this function is called.
 

-   If EXTEND is non-zero, we make the vector bigger if necessary.
-   If EXTEND is zero, we never extend the vector,
-   and we store only as many overlays as will fit.
-   But we still return the total number of overlays.  */
+   If EXTEND, make the vector bigger if necessary.
+   If not, never extend the vector,
+   and store only as many overlays as will fit.
+   But still return the total number of overlays.  */

 
 static ptrdiff_t
 
 static ptrdiff_t

-overlays_in (EMACS_INT beg, EMACS_INT end, int extend,
+overlays_in (EMACS_INT beg, EMACS_INT end, bool extend,

             Lisp_Object **vec_ptr, ptrdiff_t *len_ptr,
             ptrdiff_t *next_ptr, ptrdiff_t *prev_ptr)
 {
             Lisp_Object **vec_ptr, ptrdiff_t *len_ptr,
             ptrdiff_t *next_ptr, ptrdiff_t *prev_ptr)
 {


@@ -2976,8 +2942,8 @@ overlays_in (EMACS_INT beg, EMACS_INT end, int extend,
   Lisp_Object *vec = *vec_ptr;
   ptrdiff_t next = ZV;
   ptrdiff_t prev = BEGV;
   Lisp_Object *vec = *vec_ptr;
   ptrdiff_t next = ZV;
   ptrdiff_t prev = BEGV;

-  int inhibit_storing = 0;
-  int end_is_Z = end == Z;
+  bool inhibit_storing = 0;
+  bool end_is_Z = end == Z;

 
   for (tail = current_buffer->overlays_before; tail; tail = tail->next)
     {
 
   for (tail = current_buffer->overlays_before; tail; tail = tail->next)
     {


@@ -3078,10 +3044,10 @@ overlays_in (EMACS_INT beg, EMACS_INT end, int extend,
 }
 
 
 }
 
 

-/* Return non-zero if there exists an overlay with a non-nil
+/* Return true if there exists an overlay with a non-nil

    `mouse-face' property overlapping OVERLAY.  */
 
    `mouse-face' property overlapping OVERLAY.  */
 

-int
+bool

 mouse_face_overlay_overlaps (Lisp_Object overlay)
 {
   ptrdiff_t start = OVERLAY_POSITION (OVERLAY_START (overlay));
 mouse_face_overlay_overlaps (Lisp_Object overlay)
 {
   ptrdiff_t start = OVERLAY_POSITION (OVERLAY_START (overlay));


@@ -3110,7 +3076,7 @@ mouse_face_overlay_overlaps (Lisp_Object overlay)
 
 \f
 /* Fast function to just test if we're at an overlay boundary.  */
 
 \f
 /* Fast function to just test if we're at an overlay boundary.  */

-int
+bool

 overlay_touches_p (ptrdiff_t pos)
 {
   Lisp_Object overlay;
 overlay_touches_p (ptrdiff_t pos)
 {
   Lisp_Object overlay;


@@ -3327,7 +3293,7 @@ overlay_strings (ptrdiff_t pos, struct window *w, unsigned char **pstr)
   Lisp_Object overlay, window, str;
   struct Lisp_Overlay *ov;
   ptrdiff_t startpos, endpos;
   Lisp_Object overlay, window, str;
   struct Lisp_Overlay *ov;
   ptrdiff_t startpos, endpos;

-  int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
+  bool multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));

 
   overlay_heads.used = overlay_heads.bytes = 0;
   overlay_tails.used = overlay_tails.bytes = 0;
 
   overlay_heads.used = overlay_heads.bytes = 0;
   overlay_tails.used = overlay_tails.bytes = 0;


@@ -3435,7 +3401,7 @@ overlay_strings (ptrdiff_t pos, struct window *w, unsigned char **pstr)
            }
        }
       if (p != overlay_str_buf + total)
            }
        }
       if (p != overlay_str_buf + total)

-       abort ();
+       emacs_abort ();

       if (pstr)
        *pstr = overlay_str_buf;
       return total;
       if (pstr)
        *pstr = overlay_str_buf;
       return total;


@@ -4095,6 +4061,26 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0,
 
   return unbind_to (count, Qnil);
 }
 
   return unbind_to (count, Qnil);
 }

+
+DEFUN ("delete-all-overlays", Fdelete_all_overlays, Sdelete_all_overlays, 0, 1, 0,
+       doc: /* Delete all overlays of BUFFER.
+BUFFER omitted or nil means delete all overlays of the current
+buffer.  */)
+  (Lisp_Object buffer)
+{
+  register struct buffer *buf;
+
+  if (NILP (buffer))
+    buf = current_buffer;
+  else
+    {
+      CHECK_BUFFER (buffer);
+      buf = XBUFFER (buffer);
+    }
+
+  delete_all_overlays (buf);
+  return Qnil;
+}

 \f
 /* Overlay dissection functions.  */
 
 \f
 /* Overlay dissection functions.  */
 


@@ -4321,7 +4307,7 @@ VALUE will be returned.*/)
   (Lisp_Object overlay, Lisp_Object prop, Lisp_Object value)
 {
   Lisp_Object tail, buffer;
   (Lisp_Object overlay, Lisp_Object prop, Lisp_Object value)
 {
   Lisp_Object tail, buffer;

-  int changed;
+  bool changed;

 
   CHECK_OVERLAY (overlay);
 
 
   CHECK_OVERLAY (overlay);
 


@@ -4396,7 +4382,7 @@ add_overlay_mod_hooklist (Lisp_Object functionlist, Lisp_Object overlay)
    and the insert-after-hooks of overlay ending at START.
 
    This is called both before and after the modification.
    and the insert-after-hooks of overlay ending at START.
 
    This is called both before and after the modification.

-   AFTER is nonzero when we call after the modification.
+   AFTER is true when we call after the modification.

 
    ARG1, ARG2, ARG3 are arguments to pass to the hook functions.
    When AFTER is nonzero, they are the start position,
 
    ARG1, ARG2, ARG3 are arguments to pass to the hook functions.
    When AFTER is nonzero, they are the start position,


@@ -4404,13 +4390,13 @@ add_overlay_mod_hooklist (Lisp_Object functionlist, Lisp_Object overlay)
    and the length of deleted or replaced old text.  */
 
 void
    and the length of deleted or replaced old text.  */
 
 void

-report_overlay_modification (Lisp_Object start, Lisp_Object end, int after,
+report_overlay_modification (Lisp_Object start, Lisp_Object end, bool after,

                             Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
 {
   Lisp_Object prop, overlay;
   struct Lisp_Overlay *tail;
                             Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
 {
   Lisp_Object prop, overlay;
   struct Lisp_Overlay *tail;

-  /* 1 if this change is an insertion.  */
-  int insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end));
+  /* True if this change is an insertion.  */
+  bool insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end));

   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
 
   overlay = Qnil;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
 
   overlay = Qnil;


@@ -4530,7 +4516,7 @@ report_overlay_modification (Lisp_Object start, Lisp_Object end, int after,
 }
 
 static void
 }
 
 static void

-call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, int after,
+call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, bool after,

                        Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
 {
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
                        Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
 {
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;


@@ -4598,7 +4584,7 @@ buffer_slot_type_mismatch (Lisp_Object newval, int type)
     case_Lisp_Int:    predicate = Qintegerp; break;
     case Lisp_String: predicate = Qstringp;  break;
     case Lisp_Symbol: predicate = Qsymbolp;  break;
     case_Lisp_Int:    predicate = Qintegerp; break;
     case Lisp_String: predicate = Qstringp;  break;
     case Lisp_Symbol: predicate = Qsymbolp;  break;

-    default: abort ();
+    default: emacs_abort ();

     }
 
   wrong_type_argument (predicate, newval);
     }
 
   wrong_type_argument (predicate, newval);


@@ -4689,7 +4675,7 @@ static int mmap_page_size;
 
 /* 1 means mmap has been initialized.  */
 
 
 /* 1 means mmap has been initialized.  */
 

-static int mmap_initialized_p;
+static bool mmap_initialized_p;

 
 /* Value is X rounded up to the next multiple of N.  */
 
 
 /* Value is X rounded up to the next multiple of N.  */
 


@@ -4785,9 +4771,9 @@ mmap_find (void *start, void *end)
 
 
 /* Unmap a region.  P is a pointer to the start of the user-araa of
 
 
 /* Unmap a region.  P is a pointer to the start of the user-araa of

-   the region.  Value is non-zero if successful.  */
+   the region.  */

 
 

-static int
+static void

 mmap_free_1 (struct mmap_region *r)
 {
   if (r->next)
 mmap_free_1 (struct mmap_region *r)
 {
   if (r->next)


@@ -4798,24 +4784,19 @@ mmap_free_1 (struct mmap_region *r)
     mmap_regions = r->next;
 
   if (munmap (r, r->nbytes_mapped) == -1)
     mmap_regions = r->next;
 
   if (munmap (r, r->nbytes_mapped) == -1)

-    {
-      fprintf (stderr, "munmap: %s\n", emacs_strerror (errno));
-      return 0;
-    }
-
-  return 1;
+    fprintf (stderr, "munmap: %s\n", emacs_strerror (errno));

 }
 
 
 /* Enlarge region R by NPAGES pages.  NPAGES < 0 means shrink R.
 }
 
 
 /* Enlarge region R by NPAGES pages.  NPAGES < 0 means shrink R.

-   Value is non-zero if successful.  */
+   Value is true if successful.  */

 
 

-static int
+static bool

 mmap_enlarge (struct mmap_region *r, int npages)
 {
   char *region_end = (char *) r + r->nbytes_mapped;
   size_t nbytes;
 mmap_enlarge (struct mmap_region *r, int npages)
 {
   char *region_end = (char *) r + r->nbytes_mapped;
   size_t nbytes;

-  int success = 0;
+  bool success = 0;

 
   if (npages < 0)
     {
 
   if (npages < 0)
     {


@@ -4865,17 +4846,16 @@ mmap_enlarge (struct mmap_region *r, int npages)
 }
 
 
 }
 
 

-/* Set or reset variables holding references to mapped regions.  If
-   RESTORE_P is zero, set all variables to null.  If RESTORE_P is
-   non-zero, set all variables to the start of the user-areas
-   of mapped regions.
+/* Set or reset variables holding references to mapped regions.
+   If not RESTORE_P, set all variables to null.  If RESTORE_P, set all
+   variables to the start of the user-areas of mapped regions.

 
    This function is called from Fdump_emacs to ensure that the dumped
    Emacs doesn't contain references to memory that won't be mapped
    when Emacs starts.  */
 
 void
 
    This function is called from Fdump_emacs to ensure that the dumped
    Emacs doesn't contain references to memory that won't be mapped
    when Emacs starts.  */
 
 void

-mmap_set_vars (int restore_p)
+mmap_set_vars (bool restore_p)

 {
   struct mmap_region *r;
 
 {
   struct mmap_region *r;
 


@@ -5052,7 +5032,7 @@ alloc_buffer_text (struct buffer *b, ptrdiff_t nbytes)
 {
   void *p;
 
 {
   void *p;
 

-  BLOCK_INPUT;
+  block_input ();

 #if defined USE_MMAP_FOR_BUFFERS
   p = mmap_alloc ((void **) &b->text->beg, nbytes);
 #elif defined REL_ALLOC
 #if defined USE_MMAP_FOR_BUFFERS
   p = mmap_alloc ((void **) &b->text->beg, nbytes);
 #elif defined REL_ALLOC


@@ -5063,12 +5043,12 @@ alloc_buffer_text (struct buffer *b, ptrdiff_t nbytes)
 
   if (p == NULL)
     {
 
   if (p == NULL)
     {

-      UNBLOCK_INPUT;
+      unblock_input ();

       memory_full (nbytes);
     }
 
   b->text->beg = (unsigned char *) p;
       memory_full (nbytes);
     }
 
   b->text->beg = (unsigned char *) p;

-  UNBLOCK_INPUT;
+  unblock_input ();

 }
 
 /* Enlarge buffer B's text buffer by DELTA bytes.  DELTA < 0 means
 }
 
 /* Enlarge buffer B's text buffer by DELTA bytes.  DELTA < 0 means


@@ -5080,7 +5060,7 @@ enlarge_buffer_text (struct buffer *b, ptrdiff_t delta)
   void *p;
   ptrdiff_t nbytes = (BUF_Z_BYTE (b) - BUF_BEG_BYTE (b) + BUF_GAP_SIZE (b) + 1
                      + delta);
   void *p;
   ptrdiff_t nbytes = (BUF_Z_BYTE (b) - BUF_BEG_BYTE (b) + BUF_GAP_SIZE (b) + 1
                      + delta);

-  BLOCK_INPUT;
+  block_input ();

 #if defined USE_MMAP_FOR_BUFFERS
   p = mmap_realloc ((void **) &b->text->beg, nbytes);
 #elif defined REL_ALLOC
 #if defined USE_MMAP_FOR_BUFFERS
   p = mmap_realloc ((void **) &b->text->beg, nbytes);
 #elif defined REL_ALLOC


@@ -5091,12 +5071,12 @@ enlarge_buffer_text (struct buffer *b, ptrdiff_t delta)
 
   if (p == NULL)
     {
 
   if (p == NULL)
     {

-      UNBLOCK_INPUT;
+      unblock_input ();

       memory_full (nbytes);
     }
 
   BUF_BEG_ADDR (b) = (unsigned char *) p;
       memory_full (nbytes);
     }
 
   BUF_BEG_ADDR (b) = (unsigned char *) p;

-  UNBLOCK_INPUT;
+  unblock_input ();

 }
 
 
 }
 
 


@@ -5105,7 +5085,7 @@ enlarge_buffer_text (struct buffer *b, ptrdiff_t delta)
 static void
 free_buffer_text (struct buffer *b)
 {
 static void
 free_buffer_text (struct buffer *b)
 {

-  BLOCK_INPUT;
+  block_input ();

 
 #if defined USE_MMAP_FOR_BUFFERS
   mmap_free ((void **) &b->text->beg);
 
 #if defined USE_MMAP_FOR_BUFFERS
   mmap_free ((void **) &b->text->beg);


@@ -5116,7 +5096,7 @@ free_buffer_text (struct buffer *b)
 #endif
 
   BUF_BEG_ADDR (b) = NULL;
 #endif
 
   BUF_BEG_ADDR (b) = NULL;

-  UNBLOCK_INPUT;
+  unblock_input ();

 }
 
 
 }
 
 


@@ -5153,10 +5133,11 @@ init_buffer_once (void)
   buffer_local_symbols.indirections = 0;
   set_buffer_intervals (&buffer_defaults, NULL);
   set_buffer_intervals (&buffer_local_symbols, NULL);
   buffer_local_symbols.indirections = 0;
   set_buffer_intervals (&buffer_defaults, NULL);
   set_buffer_intervals (&buffer_local_symbols, NULL);

+  /* This is not strictly necessary, but let's make them initialized.  */
+  bset_name (&buffer_defaults, build_pure_c_string (" *buffer-defaults*"));
+  bset_name (&buffer_local_symbols, build_pure_c_string (" *buffer-local-symbols*"));

   XSETPVECTYPESIZE (&buffer_defaults, PVEC_BUFFER, pvecsize);
   XSETPVECTYPESIZE (&buffer_defaults, PVEC_BUFFER, pvecsize);

-  XSETBUFFER (Vbuffer_defaults, &buffer_defaults);

   XSETPVECTYPESIZE (&buffer_local_symbols, PVEC_BUFFER, pvecsize);
   XSETPVECTYPESIZE (&buffer_local_symbols, PVEC_BUFFER, pvecsize);

-  XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols);

 
   /* Set up the default values of various buffer slots.  */
   /* Must do these before making the first buffer! */
 
   /* Set up the default values of various buffer slots.  */
   /* Must do these before making the first buffer! */


@@ -5285,7 +5266,7 @@ init_buffer_once (void)
 
   /* Need more room? */
   if (idx >= MAX_PER_BUFFER_VARS)
 
   /* Need more room? */
   if (idx >= MAX_PER_BUFFER_VARS)

-    abort ();
+    emacs_abort ();

   last_per_buffer_idx = idx;
 
   Vbuffer_alist = Qnil;
   last_per_buffer_idx = idx;
 
   Vbuffer_alist = Qnil;


@@ -5426,7 +5407,7 @@ defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring,
   if (PER_BUFFER_IDX (offset) == 0)
     /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
        slot of buffer_local_flags */
   if (PER_BUFFER_IDX (offset) == 0)
     /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
        slot of buffer_local_flags */

-    abort ();
+    emacs_abort ();

 }
 
 
 }
 
 


@@ -5438,8 +5419,6 @@ syms_of_buffer (void)
   last_overlay_modification_hooks
     = Fmake_vector (make_number (10), Qnil);
 
   last_overlay_modification_hooks
     = Fmake_vector (make_number (10), Qnil);
 

-  staticpro (&Vbuffer_defaults);
-  staticpro (&Vbuffer_local_symbols);

   staticpro (&Qfundamental_mode);
   staticpro (&Qmode_class);
   staticpro (&QSFundamental);
   staticpro (&Qfundamental_mode);
   staticpro (&Qmode_class);
   staticpro (&QSFundamental);


@@ -6314,6 +6293,7 @@ and `bury-buffer-internal'.  */);
   defsubr (&Soverlayp);
   defsubr (&Smake_overlay);
   defsubr (&Sdelete_overlay);
   defsubr (&Soverlayp);
   defsubr (&Smake_overlay);
   defsubr (&Sdelete_overlay);

+  defsubr (&Sdelete_all_overlays);

   defsubr (&Smove_overlay);
   defsubr (&Soverlay_start);
   defsubr (&Soverlay_end);
   defsubr (&Smove_overlay);
   defsubr (&Soverlay_start);
   defsubr (&Soverlay_end);