diff options
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/src/buffer.h b/src/buffer.h index 7025cac1ec5..24c6fc5d6f2 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -456,7 +456,7 @@ struct buffer Check out mark_buffer (alloc.c) to see why. */ - EMACS_INT size; + EMACS_UINT size; /* Next buffer, in chain of all buffers including killed buffers. This chain is used only for garbage collection, in order to @@ -553,6 +553,15 @@ struct buffer /* Position where the overlay lists are centered. */ EMACS_INT overlay_center; + /* Changes in the buffer are recorded here for undo. + t means don't record anything. + This information belongs to the base buffer of an indirect buffer, + But we can't store it in the struct buffer_text + because local variables have to be right in the struct buffer. + So we copy it around in set_buffer_internal. + This comes before `name' because it is marked in a special way. */ + Lisp_Object undo_list; + /* Everything from here down must be a Lisp_Object. */ /* The name of this buffer. */ @@ -593,15 +602,6 @@ struct buffer /* Mode line element that controls format of mode line. */ Lisp_Object mode_line_format; - /* Changes in the buffer are recorded here for undo. - t means don't record anything. - This information belongs to the base buffer of an indirect buffer, - But we can't store it in the struct buffer_text - because local variables have to be right in the struct buffer. - So we copy it around in set_buffer_internal. - This comes before `name' because it is marked in a special way. */ - Lisp_Object undo_list; - /* Analogous to mode_line_format for the line displayed at the top of windows. Nil means don't display that line. */ Lisp_Object header_line_format; @@ -819,18 +819,6 @@ extern struct buffer buffer_local_flags; that don't have such names. */ extern struct buffer buffer_local_symbols; - -/* This structure holds the required types for the values in the - buffer-local slots. If a slot contains Qnil, then the - corresponding buffer slot may contain a value of any type. If a - slot contains an integer, then prospective values' tags must be - equal to that integer (except nil is always allowed). - When a tag does not match, the function - buffer_slot_type_mismatch will signal an error. - - If a slot here contains -1, the corresponding variable is read-only. */ - -extern struct buffer buffer_local_types; extern void delete_all_overlays P_ ((struct buffer *)); extern void reset_buffer P_ ((struct buffer *)); @@ -844,7 +832,7 @@ extern void set_buffer_internal P_ ((struct buffer *)); extern void set_buffer_internal_1 P_ ((struct buffer *)); extern void set_buffer_temp P_ ((struct buffer *)); extern void record_buffer P_ ((Lisp_Object)); -extern void buffer_slot_type_mismatch P_ ((int)) NO_RETURN; +extern void buffer_slot_type_mismatch P_ ((Lisp_Object, int)) NO_RETURN; extern void fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT)); extern void mmap_set_vars P_ ((int)); @@ -996,11 +984,5 @@ extern int last_per_buffer_idx; #define PER_BUFFER_SYMBOL(OFFSET) \ (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_symbols)) -/* Return the type of the per-buffer variable at offset OFFSET in the - buffer structure. */ - -#define PER_BUFFER_TYPE(OFFSET) \ - (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_types)) - /* arch-tag: 679305dd-d41c-4a50-b170-3caf5c97b2d1 (do not change this comment) */ |