*** empty log message ***

[gnu-emacs] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 6014b42b5846d40a893ad435860167ae1eac1808..61f1270965d1d77713f15fb956c9c7b5c9b607e9 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -216,6 +216,7 @@ extern void set_point P_ ((struct buffer *, int));
 extern INLINE void temp_set_point P_ ((struct buffer *, int));
 extern void set_point_both P_ ((struct buffer *, int, int));
 extern INLINE void temp_set_point_both P_ ((struct buffer *, int, int));
+extern void enlarge_buffer_text P_ ((struct buffer *, int));
 
 \f
 /* Macros for setting the BEGV, ZV or PT of a given buffer.
@@ -253,7 +254,7 @@ extern INLINE void temp_set_point_both P_ ((struct buffer *, int, int));
    These macros do not check that the position is in range.  */
 
 /* Access a Lisp position value in POS,
-   and store the charpos in CHARPOS and the bypepos in BYPEPOS.  */
+   and store the charpos in CHARPOS and the bytepos in BYTEPOS.  */
 
 #define DECODE_POSITION(charpos, bytepos, pos)                 \
 if (1)                                                         \
@@ -423,8 +424,8 @@ struct buffer_text
        end_unchanged contain no useful information.  */
     int overlay_unchanged_modified;
 
-    /* Properties of this buffer's text -- conditionally compiled.  */
-    DECLARE_INTERVALS
+    /* Properties of this buffer's text.  */
+    INTERVAL intervals;
 
     /* The markers that refer to this buffer.
        This is actually a single marker ---
@@ -799,7 +800,7 @@ extern void set_buffer_temp P_ ((struct buffer *));
 extern void record_buffer P_ ((Lisp_Object));
 extern void buffer_slot_type_mismatch P_ ((int));
 extern void fix_overlays_before P_ ((struct buffer *, int, int));
-
+extern void mmap_set_vars P_ ((int));
 
 EXFUN (Fbuffer_name, 1);
 EXFUN (Fget_file_buffer, 1);
@@ -837,27 +838,7 @@ extern Lisp_Object Vtransient_mark_mode;
 #define OVERLAY_POSITION(P) \
  (GC_MARKERP (P) ? marker_position (P) : (abort (), 0))
 
-/* Allocation of buffer text.  */
-
-#ifdef REL_ALLOC
-
-extern char *r_alloc P_ ((char **, unsigned long));
-extern void r_alloc_free P_ ((char **ptr));
-extern char *r_re_alloc P_ ((char **, unsigned long));
-
-#define BUFFER_ALLOC(data,size) \
-     ((unsigned char *) r_alloc ((char **)&data, (size)))
-#define BUFFER_REALLOC(data,size) \
-     ((unsigned char *) r_re_alloc ((char **) &data, (size)))
-#define BUFFER_FREE(data) (r_alloc_free ((char **) &data))
-#define R_ALLOC_DECLARE(var,data) (r_alloc_declare (&var, (data)))
-#else
-#define BUFFER_ALLOC(data,size) (data = (unsigned char *) malloc ((size)))
-#define BUFFER_REALLOC(data,size) ((unsigned char *) realloc ((data), (size)))
-#define BUFFER_FREE(data) (free ((data)))
-#define R_ALLOC_DECLARE(var,data)
-#endif
-
+\f
 /***********************************************************************
                        Buffer-local Variables
  ***********************************************************************/