(Fset_window_margins): Allow only integers as args.

[gnu-emacs] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 6f25891ca6fe538ef4358e572bd24ea5317cd35c..14d3aa6d5ee9fe8d320da32c450e3d1de639cfdb 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Position of beginning of buffer.  */
 #define BEG (1)
-#define BEG_BYTE (1)
+#define BEG_BYTE (BEG)
 
 /* Position of beginning of accessible range of buffer.  */
 #define BEGV (current_buffer->begv)
@@ -397,11 +397,11 @@ struct buffer_text
        into a buffer's text to functions that malloc.  */
     unsigned char *beg;
 
-    int gpt;                   /* Char pos of gap in buffer.  */
-    int z;                     /* Char pos of end of buffer.  */
-    int gpt_byte;              /* Byte pos of gap in buffer.  */
-    int z_byte;                        /* Byte pos of end of buffer.  */
-    int gap_size;              /* Size of buffer's gap.  */
+    EMACS_INT gpt;             /* Char pos of gap in buffer.  */
+    EMACS_INT z;               /* Char pos of end of buffer.  */
+    EMACS_INT gpt_byte;                /* Byte pos of gap in buffer.  */
+    EMACS_INT z_byte;          /* Byte pos of end of buffer.  */
+    EMACS_INT gap_size;                /* Size of buffer's gap.  */
     int modiff;                        /* This counts buffer-modification events
                                   for this buffer.  It is incremented for
                                   each such event, and never otherwise
@@ -412,10 +412,10 @@ struct buffer_text
     int overlay_modiff;                /* Counts modifications to overlays.  */
 
     /* Minimum value of GPT - BEG since last redisplay that finished.  */
-    int beg_unchanged;
+    EMACS_INT beg_unchanged;
 
     /* Minimum value of Z - GPT since last redisplay that finished.  */
-    int end_unchanged;
+    EMACS_INT end_unchanged;
 
     /* MODIFF as of last redisplay that finished; if it matches MODIFF,
        beg_unchanged and end_unchanged contain no useful information.  */
@@ -464,17 +464,17 @@ struct buffer
   struct buffer_text *text;
 
   /* Char position of point in buffer.  */
-  int pt;
+  EMACS_INT pt;
   /* Byte position of point in buffer.  */
-  int pt_byte;
+  EMACS_INT pt_byte;
   /* Char position of beginning of accessible range.  */
-  int begv;
+  EMACS_INT begv;
   /* Byte position of beginning of accessible range.  */
-  int begv_byte;
+  EMACS_INT begv_byte;
   /* Char position of end of accessible range.  */
-  int zv;
+  EMACS_INT zv;
   /* Byte position of end of accessible range.  */
-  int zv_byte;
+  EMACS_INT zv_byte;
 
   /* In an indirect buffer, this points to the base buffer.
      In an ordinary buffer, it is 0.  */
@@ -503,7 +503,7 @@ struct buffer
   int auto_save_failure_time;
   /* Position in buffer at which display started
      the last time this buffer was displayed.  */
-  int last_window_start;
+  EMACS_INT last_window_start;
 
   /* Set nonzero whenever the narrowing is changed in this buffer.  */
   int clip_changed;
@@ -531,6 +531,14 @@ struct buffer
      displaying this buffer.  */
   unsigned prevent_redisplay_optimizations_p : 1;
 
+  /* List of overlays that end at or before the current center,
+     in order of end-position.  */
+  struct Lisp_Overlay *overlays_before;
+
+  /* List of overlays that end after  the current center,
+     in order of start-position.  */
+  struct Lisp_Overlay *overlays_after;
+
   /* Position where the overlay lists are centered.  */
   EMACS_INT overlay_center;
 
@@ -647,14 +655,6 @@ struct buffer
   /* t means the mark and region are currently active.  */
   Lisp_Object mark_active;
 
-  /* List of overlays that end at or before the current center,
-     in order of end-position.  */
-  Lisp_Object overlays_before;
-
-  /* List of overlays that end after  the current center,
-     in order of start-position.  */
-  Lisp_Object overlays_after;
-
   /* Non-nil means the buffer contents are regarded as multi-byte
      form of characters, not a binary code.  */
   Lisp_Object enable_multibyte_characters;
@@ -804,6 +804,7 @@ extern struct buffer buffer_local_symbols;
 
 extern struct buffer buffer_local_types;
 \f
+extern void delete_all_overlays P_ ((struct buffer *));
 extern void reset_buffer P_ ((struct buffer *));
 extern void evaporate_overlays P_ ((EMACS_INT));
 extern int overlays_at P_ ((EMACS_INT, int, Lisp_Object **, int *, int *, int *, int));
@@ -934,3 +935,6 @@ extern int last_per_buffer_idx;
 
 #define PER_BUFFER_TYPE(OFFSET) \
       (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_types))
+
+/* arch-tag: 679305dd-d41c-4a50-b170-3caf5c97b2d1
+   (do not change this comment) */