X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/339ee9797d7d80d6b934e6a335c57d39303bbdcc..8cabe764e9f3acb3d2b029c4737c8c885346655c:/src/buffer.h diff --git a/src/buffer.h b/src/buffer.h index a3e87c8f20..7025cac1ec 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,11 +1,13 @@ /* Header file for the buffer manipulation primitives. - Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) +the Free Software Foundation; either version 3, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, @@ -15,8 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* Accessing the parameters of the current buffer. */ @@ -24,53 +26,53 @@ Boston, MA 02111-1307, USA. */ /* These macros come in pairs, one for the char position and one for the byte position. */ -/* Position of beginning of buffer. */ +/* Position of beginning of buffer. */ #define BEG (1) -#define BEG_BYTE (1) +#define BEG_BYTE (BEG) -/* Position of beginning of accessible range of buffer. */ +/* Position of beginning of accessible range of buffer. */ #define BEGV (current_buffer->begv) #define BEGV_BYTE (current_buffer->begv_byte) /* Position of point in buffer. The "+ 0" makes this - not an l-value, so you can't assign to it. Use SET_PT instead. */ + not an l-value, so you can't assign to it. Use SET_PT instead. */ #define PT (current_buffer->pt + 0) #define PT_BYTE (current_buffer->pt_byte + 0) -/* Position of gap in buffer. */ +/* Position of gap in buffer. */ #define GPT (current_buffer->text->gpt) #define GPT_BYTE (current_buffer->text->gpt_byte) -/* Position of end of accessible range of buffer. */ +/* Position of end of accessible range of buffer. */ #define ZV (current_buffer->zv) #define ZV_BYTE (current_buffer->zv_byte) -/* Position of end of buffer. */ +/* Position of end of buffer. */ #define Z (current_buffer->text->z) #define Z_BYTE (current_buffer->text->z_byte) /* Macros for the addresses of places in the buffer. */ -/* Address of beginning of buffer. */ +/* Address of beginning of buffer. */ #define BEG_ADDR (current_buffer->text->beg) -/* Address of beginning of accessible range of buffer. */ +/* Address of beginning of accessible range of buffer. */ #define BEGV_ADDR (BYTE_POS_ADDR (current_buffer->begv_byte)) -/* Address of point in buffer. */ +/* Address of point in buffer. */ #define PT_ADDR (BYTE_POS_ADDR (current_buffer->pt_byte)) -/* Address of beginning of gap in buffer. */ -#define GPT_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte - 1) +/* Address of beginning of gap in buffer. */ +#define GPT_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte - BEG_BYTE) /* Address of end of gap in buffer. */ -#define GAP_END_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte + current_buffer->text->gap_size - 1) +#define GAP_END_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte + current_buffer->text->gap_size - BEG_BYTE) -/* Address of end of accessible range of buffer. */ +/* Address of end of accessible range of buffer. */ #define ZV_ADDR (BYTE_POS_ADDR (current_buffer->zv_byte)) -/* Address of end of buffer. */ -#define Z_ADDR (current_buffer->text->beg + current_buffer->text->gap_size + current_buffer->text->z_byte - 1) +/* Address of end of buffer. */ +#define Z_ADDR (current_buffer->text->beg + current_buffer->text->gap_size + current_buffer->text->z_byte - BEG_BYTE) /* Size of gap. */ #define GAP_SIZE (current_buffer->text->gap_size) @@ -81,6 +83,9 @@ Boston, MA 02111-1307, USA. */ /* Modification count. */ #define MODIFF (current_buffer->text->modiff) +/* Character modification count. */ +#define CHARS_MODIFF (current_buffer->text->chars_modiff) + /* Overlay modification count. */ #define OVERLAY_MODIFF (current_buffer->text->overlay_modiff) @@ -100,27 +105,27 @@ Boston, MA 02111-1307, USA. */ /* Similar macros to operate on a specified buffer. Note that many of these evaluate the buffer argument more than once. */ -/* Position of beginning of buffer. */ -#define BUF_BEG(buf) (1) -#define BUF_BEG_BYTE(buf) (1) +/* Position of beginning of buffer. */ +#define BUF_BEG(buf) (BEG) +#define BUF_BEG_BYTE(buf) (BEG_BYTE) -/* Position of beginning of accessible range of buffer. */ +/* Position of beginning of accessible range of buffer. */ #define BUF_BEGV(buf) ((buf)->begv) #define BUF_BEGV_BYTE(buf) ((buf)->begv_byte) -/* Position of point in buffer. */ +/* Position of point in buffer. */ #define BUF_PT(buf) ((buf)->pt) #define BUF_PT_BYTE(buf) ((buf)->pt_byte) -/* Position of gap in buffer. */ +/* Position of gap in buffer. */ #define BUF_GPT(buf) ((buf)->text->gpt) #define BUF_GPT_BYTE(buf) ((buf)->text->gpt_byte) -/* Position of end of accessible range of buffer. */ +/* Position of end of accessible range of buffer. */ #define BUF_ZV(buf) ((buf)->zv) #define BUF_ZV_BYTE(buf) ((buf)->zv_byte) -/* Position of end of buffer. */ +/* Position of end of buffer. */ #define BUF_Z(buf) ((buf)->text->z) #define BUF_Z_BYTE(buf) ((buf)->text->z_byte) @@ -128,13 +133,13 @@ Boston, MA 02111-1307, USA. */ #define BUF_BEG_ADDR(buf) ((buf)->text->beg) /* Address of beginning of gap of buffer. */ -#define BUF_GPT_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte - 1) +#define BUF_GPT_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte - BEG_BYTE) /* Address of end of buffer. */ -#define BUF_Z_ADDR(buf) ((buf)->text->beg + (buf)->text->gap_size + (buf)->text->z_byte - 1) +#define BUF_Z_ADDR(buf) ((buf)->text->beg + (buf)->text->gap_size + (buf)->text->z_byte - BEG_BYTE) /* Address of end of gap in buffer. */ -#define BUF_GAP_END_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte + (buf)->text->gap_size - 1) +#define BUF_GAP_END_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte + (buf)->text->gap_size - BEG_BYTE) /* Size of gap. */ #define BUF_GAP_SIZE(buf) ((buf)->text->gap_size) @@ -146,6 +151,9 @@ Boston, MA 02111-1307, USA. */ /* Modification count. */ #define BUF_MODIFF(buf) ((buf)->text->modiff) +/* Character modification count. */ +#define BUF_CHARS_MODIFF(buf) ((buf)->text->chars_modiff) + /* Modification count as of last visit or save. */ #define BUF_SAVE_MODIFF(buf) ((buf)->text->save_modiff) @@ -180,8 +188,9 @@ Boston, MA 02111-1307, USA. */ #define BUF_COMPUTE_UNCHANGED(buf, start, end) \ do \ { \ - if (BUF_UNCHANGED_MODIFIED (buf) == MODIFF \ - && BUF_OVERLAY_UNCHANGED_MODIFIED (buf) == OVERLAY_MODIFF) \ + if (BUF_UNCHANGED_MODIFIED (buf) == BUF_MODIFF (buf) \ + && (BUF_OVERLAY_UNCHANGED_MODIFIED (buf) \ + == BUF_OVERLAY_MODIFF (buf))) \ { \ BUF_BEG_UNCHANGED (buf) = (start) - BUF_BEG (buf); \ BUF_END_UNCHANGED (buf) = BUF_Z (buf) - (end); \ @@ -195,9 +204,9 @@ Boston, MA 02111-1307, USA. */ } \ } \ while (0) - + -/* Macros to set PT in the current buffer, or another buffer.. */ +/* Macros to set PT in the current buffer, or another buffer. */ #define SET_PT(position) (set_point (current_buffer, (position))) #define TEMP_SET_PT(position) (temp_set_point (current_buffer, (position))) @@ -216,6 +225,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)); /* Macros for setting the BEGV, ZV or PT of a given buffer. @@ -253,7 +263,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) \ @@ -277,14 +287,14 @@ else /* Return the address of byte position N in current buffer. */ #define BYTE_POS_ADDR(n) \ - (((n) >= GPT_BYTE ? GAP_SIZE : 0) + (n) + BEG_ADDR - 1) + (((n) >= GPT_BYTE ? GAP_SIZE : 0) + (n) + BEG_ADDR - BEG_BYTE) /* Return the address of char position N. */ #define CHAR_POS_ADDR(n) \ (((n) >= GPT ? GAP_SIZE : 0) \ + buf_charpos_to_bytepos (current_buffer, n) \ - + BEG_ADDR - 1) + + BEG_ADDR - BEG_BYTE) /* Convert a character position to a byte position. */ @@ -300,8 +310,8 @@ else #define PTR_BYTE_POS(ptr) \ ((ptr) - (current_buffer)->text->beg \ - - (ptr - (current_buffer)->text->beg < (unsigned) GPT_BYTE ? 0 : GAP_SIZE) \ - + 1) + - (ptr - (current_buffer)->text->beg <= (unsigned) (GPT_BYTE - BEG_BYTE) ? 0 : GAP_SIZE) \ + + BEG_BYTE) /* Return character at position POS. */ @@ -324,7 +334,7 @@ extern int _fetch_multibyte_char_len; #define FETCH_MULTIBYTE_CHAR(pos) \ (_fetch_multibyte_char_p = (((pos) >= GPT_BYTE ? GAP_SIZE : 0) \ - + (pos) + BEG_ADDR - 1), \ + + (pos) + BEG_ADDR - BEG_BYTE), \ _fetch_multibyte_char_len \ = ((pos) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) - (pos), \ STRING_CHAR (_fetch_multibyte_char_p, _fetch_multibyte_char_len)) @@ -333,18 +343,18 @@ extern int _fetch_multibyte_char_len; or converting between byte positions and addresses, in a specified buffer. */ -/* Return the address of character at byte position POS in buffer BUF. +/* Return the address of character at byte position POS in buffer BUF. Note that both arguments can be computed more than once. */ #define BUF_BYTE_ADDRESS(buf, pos) \ -((buf)->text->beg + (pos) - 1 \ +((buf)->text->beg + (pos) - BEG_BYTE \ + ((pos) >= (buf)->text->gpt_byte ? (buf)->text->gap_size : 0)) -/* Return the address of character at char position POS in buffer BUF. +/* Return the address of character at char position POS in buffer BUF. Note that both arguments can be computed more than once. */ #define BUF_CHAR_ADDRESS(buf, pos) \ -((buf)->text->beg + buf_charpos_to_bytepos ((buf), (pos)) - 1 \ +((buf)->text->beg + buf_charpos_to_bytepos ((buf), (pos)) - BEG_BYTE \ + ((pos) >= (buf)->text->gpt ? (buf)->text->gap_size : 0)) /* Convert PTR, the address of a char in buffer BUF, @@ -352,9 +362,9 @@ extern int _fetch_multibyte_char_len; #define BUF_PTR_BYTE_POS(buf, ptr) \ ((ptr) - (buf)->text->beg \ - - (ptr - (buf)->text->beg < (unsigned) BUF_GPT_BYTE ((buf)) \ + - (ptr - (buf)->text->beg <= (unsigned) (BUF_GPT_BYTE ((buf)) - BEG_BYTE)\ ? 0 : BUF_GAP_SIZE ((buf))) \ - + 1) + + BEG_BYTE) /* Return the character at byte position POS in buffer BUF. */ @@ -375,7 +385,7 @@ extern int _fetch_multibyte_char_len; #define BUF_FETCH_MULTIBYTE_CHAR(buf, pos) \ (_fetch_multibyte_char_p \ = (((pos) >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0) \ - + (pos) + BUF_BEG_ADDR (buf) - 1), \ + + (pos) + BUF_BEG_ADDR (buf) - BEG_BYTE), \ _fetch_multibyte_char_len \ = (((pos) >= BUF_GPT_BYTE (buf) ? BUF_ZV_BYTE (buf) : BUF_GPT_BYTE (buf)) \ - (pos)), \ @@ -388,26 +398,35 @@ extern int _fetch_multibyte_char_len; struct buffer_text { - unsigned char *beg; /* Actual address of buffer contents. */ - 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. */ + /* Actual address of buffer contents. If REL_ALLOC is defined, + this address might change when blocks are relocated which can + e.g. happen when malloc is called. So, don't pass a pointer + into a buffer's text to functions that malloc. */ + unsigned char *beg; + + 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 changed. */ + int chars_modiff; /* This is modified with character change + events for this buffer. It is set to + modiff for each such event, and never + otherwise changed. */ int save_modiff; /* Previous value of modiff, as of last time buffer visited or saved a file. */ 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. */ @@ -418,312 +437,354 @@ 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 --- successive elements in its marker `chain' are the other markers referring to this buffer. */ - Lisp_Object markers; + struct Lisp_Marker *markers; }; /* This is the structure that the buffer Lisp object points to. */ struct buffer - { - /* Everything before the `name' slot must be of a non-Lisp_Object type, - and every slot after `name' must be a Lisp_Object. - - Check out mark_buffer (alloc.c) to see why. */ - - EMACS_INT size; - - /* Next buffer, in chain of all buffers including killed buffers. - This chain is used only for garbage collection, in order to - collect killed buffers properly. - Note that vectors and most pseudovectors are all on one chain, - but buffers are on a separate chain of their own. */ - struct buffer *next; - - /* This structure holds the coordinates of the buffer contents - in ordinary buffers. In indirect buffers, this is not used. */ - struct buffer_text own_text; - - /* This points to the `struct buffer_text' that used for this buffer. - In an ordinary buffer, this is the own_text field above. - In an indirect buffer, this is the own_text field of another buffer. */ - struct buffer_text *text; - - /* Char position of point in buffer. */ - int pt; - /* Byte position of point in buffer. */ - int pt_byte; - /* Char position of beginning of accessible range. */ - int begv; - /* Byte position of beginning of accessible range. */ - int begv_byte; - /* Char position of end of accessible range. */ - int zv; - /* Byte position of end of accessible range. */ - int zv_byte; - - /* In an indirect buffer, this points to the base buffer. - In an ordinary buffer, it is 0. */ - struct buffer *base_buffer; - - /* Flags saying which DEFVAR_PER_BUFFER variables - are local to this buffer. */ - int local_var_flags; - /* Set to the modtime of the visited file when read or written. - -1 means visited file was nonexistent. - 0 means visited file modtime unknown; in no case complain - about any mismatch on next save attempt. */ - int modtime; - /* the value of text->modiff at the last auto-save. */ - int auto_save_modified; - /* The time at which we detected a failure to auto-save, - Or -1 if we didn't have a failure. */ - int auto_save_failure_time; - /* Position in buffer at which display started - the last time this buffer was displayed. */ - int last_window_start; - - /* Set nonzero whenever the narrowing is changed in this buffer. */ - int clip_changed; - - /* If the long line scan cache is enabled (i.e. the buffer-local - variable cache-long-line-scans is non-nil), newline_cache - points to the newline cache, and width_run_cache points to the - width run cache. - - The newline cache records which stretches of the buffer are - known *not* to contain newlines, so that they can be skipped - quickly when we search for newlines. - - The width run cache records which stretches of the buffer are - known to contain characters whose widths are all the same. If - the width run cache maps a character to a value > 0, that value is - the character's width; if it maps a character to zero, we don't - know what its width is. This allows compute_motion to process - such regions very quickly, using algebra instead of inspecting - each character. See also width_table, below. */ - struct region_cache *newline_cache; - struct region_cache *width_run_cache; - - /* Non-zero means don't use redisplay optimizations for - displaying this buffer. */ - unsigned prevent_redisplay_optimizations_p : 1; - - /* 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. */ - Lisp_Object name; - - /* The name of the file visited in this buffer, or nil. */ - Lisp_Object filename; - /* Dir for expanding relative file names. */ - Lisp_Object directory; - /* True iff this buffer has been backed up (if you write to the - visited file and it hasn't been backed up, then a backup will - be made). */ - /* This isn't really used by the C code, so could be deleted. */ - Lisp_Object backed_up; - /* Length of file when last read or saved. - This is not in the struct buffer_text - because it's not used in indirect buffers at all. */ - Lisp_Object save_length; - /* File name used for auto-saving this buffer. - This is not in the struct buffer_text - because it's not used in indirect buffers at all. */ - Lisp_Object auto_save_file_name; - - /* Non-nil if buffer read-only. */ - Lisp_Object read_only; - /* "The mark". This is a marker which may - point into this buffer or may point nowhere. */ - Lisp_Object mark; - - /* Alist of elements (SYMBOL . VALUE-IN-THIS-BUFFER) - for all per-buffer variables of this buffer. */ - Lisp_Object local_var_alist; - - /* Symbol naming major mode (eg, lisp-mode). */ - Lisp_Object major_mode; - /* Pretty name of major mode (eg, "Lisp"). */ - Lisp_Object mode_name; - /* Mode line element that controls format of mode line. */ - Lisp_Object mode_line_format; - - /* 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; - - /* Keys that are bound local to this buffer. */ - Lisp_Object keymap; - /* This buffer's local abbrev table. */ - Lisp_Object abbrev_table; - /* This buffer's syntax table. */ - Lisp_Object syntax_table; - /* This buffer's category table. */ - Lisp_Object category_table; - - /* Values of several buffer-local variables */ - /* tab-width is buffer-local so that redisplay can find it - in buffers that are not current */ - Lisp_Object case_fold_search; - Lisp_Object tab_width; - Lisp_Object fill_column; - Lisp_Object left_margin; - /* Function to call when insert space past fill column. */ - Lisp_Object auto_fill_function; - /* nil: text, t: binary. - This value is meaningful only on certain operating systems. */ - /* Actually, we don't need this flag any more because end-of-line - is handled correctly according to the buffer-file-coding-system - of the buffer. Just keeping it for backward compatibility. */ - Lisp_Object buffer_file_type; - - /* Case table for case-conversion in this buffer. - This char-table maps each char into its lower-case version. */ - Lisp_Object downcase_table; - /* Char-table mapping each char to its upper-case version. */ - Lisp_Object upcase_table; - /* Char-table for conversion for case-folding search. */ - Lisp_Object case_canon_table; - /* Char-table of equivalences for case-folding search. */ - Lisp_Object case_eqv_table; - - /* Non-nil means do not display continuation lines. */ - Lisp_Object truncate_lines; - /* Non-nil means display ctl chars with uparrow. */ - Lisp_Object ctl_arrow; - /* Non-nil means display text from right to left. */ - Lisp_Object direction_reversed; - /* Non-nil means do selective display; - see doc string in syms_of_buffer (buffer.c) for details. */ - Lisp_Object selective_display; +{ + /* Everything before the `name' slot must be of a non-Lisp_Object type, + and every slot after `name' must be a Lisp_Object. + + Check out mark_buffer (alloc.c) to see why. */ + + EMACS_INT size; + + /* Next buffer, in chain of all buffers including killed buffers. + This chain is used only for garbage collection, in order to + collect killed buffers properly. + Note that vectors and most pseudovectors are all on one chain, + but buffers are on a separate chain of their own. */ + struct buffer *next; + + /* This structure holds the coordinates of the buffer contents + in ordinary buffers. In indirect buffers, this is not used. */ + struct buffer_text own_text; + + /* This points to the `struct buffer_text' that used for this buffer. + In an ordinary buffer, this is the own_text field above. + In an indirect buffer, this is the own_text field of another buffer. */ + struct buffer_text *text; + + /* Char position of point in buffer. */ + EMACS_INT pt; + /* Byte position of point in buffer. */ + EMACS_INT pt_byte; + /* Char position of beginning of accessible range. */ + EMACS_INT begv; + /* Byte position of beginning of accessible range. */ + EMACS_INT begv_byte; + /* Char position of end of accessible range. */ + EMACS_INT zv; + /* Byte position of end of accessible range. */ + EMACS_INT zv_byte; + + /* In an indirect buffer, this points to the base buffer. + In an ordinary buffer, it is 0. */ + struct buffer *base_buffer; + + /* A non-zero value in slot IDX means that per-buffer variable + with index IDX has a local value in this buffer. The index IDX + for a buffer-local variable is stored in that variable's slot + in buffer_local_flags as a Lisp integer. If the index is -1, + this means the variable is always local in all buffers. */ +#define MAX_PER_BUFFER_VARS 50 + char local_flags[MAX_PER_BUFFER_VARS]; + + /* Set to the modtime of the visited file when read or written. + -1 means visited file was nonexistent. + 0 means visited file modtime unknown; in no case complain + about any mismatch on next save attempt. */ + int modtime; + /* The value of text->modiff at the last auto-save. */ + int auto_save_modified; + /* The value of text->modiff at the last display error. + Redisplay of this buffer is inhibited until it changes again. */ + int display_error_modiff; + /* The time at which we detected a failure to auto-save, + Or -1 if we didn't have a failure. */ + int auto_save_failure_time; + /* Position in buffer at which display started + the last time this buffer was displayed. */ + EMACS_INT last_window_start; + + /* Set nonzero whenever the narrowing is changed in this buffer. */ + int clip_changed; + + /* If the long line scan cache is enabled (i.e. the buffer-local + variable cache-long-line-scans is non-nil), newline_cache + points to the newline cache, and width_run_cache points to the + width run cache. + + The newline cache records which stretches of the buffer are + known *not* to contain newlines, so that they can be skipped + quickly when we search for newlines. + + The width run cache records which stretches of the buffer are + known to contain characters whose widths are all the same. If + the width run cache maps a character to a value > 0, that value is + the character's width; if it maps a character to zero, we don't + know what its width is. This allows compute_motion to process + such regions very quickly, using algebra instead of inspecting + each character. See also width_table, below. */ + struct region_cache *newline_cache; + struct region_cache *width_run_cache; + + /* Non-zero means don't use redisplay optimizations for + 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; + + /* Everything from here down must be a Lisp_Object. */ + + /* The name of this buffer. */ + Lisp_Object name; + + /* The name of the file visited in this buffer, or nil. */ + Lisp_Object filename; + /* Dir for expanding relative file names. */ + Lisp_Object directory; + /* True if this buffer has been backed up (if you write to the + visited file and it hasn't been backed up, then a backup will + be made). */ + /* This isn't really used by the C code, so could be deleted. */ + Lisp_Object backed_up; + /* Length of file when last read or saved. + This is not in the struct buffer_text + because it's not used in indirect buffers at all. */ + Lisp_Object save_length; + /* File name used for auto-saving this buffer. + This is not in the struct buffer_text + because it's not used in indirect buffers at all. */ + Lisp_Object auto_save_file_name; + + /* Non-nil if buffer read-only. */ + Lisp_Object read_only; + /* "The mark". This is a marker which may + point into this buffer or may point nowhere. */ + Lisp_Object mark; + + /* Alist of elements (SYMBOL . VALUE-IN-THIS-BUFFER) + for all per-buffer variables of this buffer. */ + Lisp_Object local_var_alist; + + /* Symbol naming major mode (eg, lisp-mode). */ + Lisp_Object major_mode; + /* Pretty name of major mode (eg, "Lisp"). */ + Lisp_Object mode_name; + /* 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; + + /* Keys that are bound local to this buffer. */ + Lisp_Object keymap; + /* This buffer's local abbrev table. */ + Lisp_Object abbrev_table; + /* This buffer's syntax table. */ + Lisp_Object syntax_table; + /* This buffer's category table. */ + Lisp_Object category_table; + + /* Values of several buffer-local variables. */ + /* tab-width is buffer-local so that redisplay can find it + in buffers that are not current. */ + Lisp_Object case_fold_search; + Lisp_Object tab_width; + Lisp_Object fill_column; + Lisp_Object left_margin; + /* Function to call when insert space past fill column. */ + Lisp_Object auto_fill_function; + /* nil: text, t: binary. + This value is meaningful only on certain operating systems. */ + /* Actually, we don't need this flag any more because end-of-line + is handled correctly according to the buffer-file-coding-system + of the buffer. Just keeping it for backward compatibility. */ + Lisp_Object buffer_file_type; + + /* Case table for case-conversion in this buffer. + This char-table maps each char into its lower-case version. */ + Lisp_Object downcase_table; + /* Char-table mapping each char to its upper-case version. */ + Lisp_Object upcase_table; + /* Char-table for conversion for case-folding search. */ + Lisp_Object case_canon_table; + /* Char-table of equivalences for case-folding search. */ + Lisp_Object case_eqv_table; + + /* Non-nil means do not display continuation lines. */ + Lisp_Object truncate_lines; + /* Non-nil means display ctl chars with uparrow. */ + Lisp_Object ctl_arrow; + /* Non-nil means display text from right to left. */ + Lisp_Object direction_reversed; + /* Non-nil means do selective display; + see doc string in syms_of_buffer (buffer.c) for details. */ + Lisp_Object selective_display; #ifndef old - /* Non-nil means show ... at end of line followed by invisible lines. */ - Lisp_Object selective_display_ellipses; + /* Non-nil means show ... at end of line followed by invisible lines. */ + Lisp_Object selective_display_ellipses; #endif - /* Alist of (FUNCTION . STRING) for each minor mode enabled in buffer. */ - Lisp_Object minor_modes; - /* t if "self-insertion" should overwrite; `binary' if it should also - overwrite newlines and tabs - for editing executables and the like. */ - Lisp_Object overwrite_mode; - /* non-nil means abbrev mode is on. Expand abbrevs automatically. */ - Lisp_Object abbrev_mode; - /* Display table to use for text in this buffer. */ - Lisp_Object display_table; - /* 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; - - /* Position where the overlay lists are centered. */ - Lisp_Object overlay_center; - - /* Non-nil means the buffer contents are regarded as multi-byte - form of characters, not a binary code. */ - Lisp_Object enable_multibyte_characters; - - /* Coding system to be used for encoding the buffer contents on - saving. */ - Lisp_Object buffer_file_coding_system; - - /* List of symbols naming the file format used for visited file. */ - Lisp_Object file_format; - - /* True if the newline position cache and width run cache are - enabled. See search.c and indent.c. */ - Lisp_Object cache_long_line_scans; - - /* If the width run cache is enabled, this table contains the - character widths width_run_cache (see above) assumes. When we - do a thorough redisplay, we compare this against the buffer's - current display table to see whether the display table has - affected the widths of any characters. If it has, we - invalidate the width run cache, and re-initialize width_table. */ - Lisp_Object width_table; - - /* In an indirect buffer, or a buffer that is the base of an - indirect buffer, this holds a marker that records - PT for this buffer when the buffer is not current. */ - Lisp_Object pt_marker; - - /* In an indirect buffer, or a buffer that is the base of an - indirect buffer, this holds a marker that records - BEGV for this buffer when the buffer is not current. */ - Lisp_Object begv_marker; - - /* In an indirect buffer, or a buffer that is the base of an - indirect buffer, this holds a marker that records - ZV for this buffer when the buffer is not current. */ - Lisp_Object zv_marker; - - /* This holds the point value before the last scroll operation. - Explicitly setting point sets this to nil. */ - Lisp_Object point_before_scroll; - - /* Truename of the visited file, or nil. */ - Lisp_Object file_truename; - - /* Invisibility spec of this buffer. - t => any non-nil `invisible' property means invisible. - A list => `invisible' property means invisible - if it is memq in that list. */ - Lisp_Object invisibility_spec; - - /* This is the last window that was selected with this buffer in it, - or nil if that window no longer displays this buffer. */ - Lisp_Object last_selected_window; - - /* Incremented each time the buffer is displayed in a window. */ - Lisp_Object display_count; - - /* Widths of left and right marginal areas for windows displaying - this buffer. */ - Lisp_Object left_margin_width, right_margin_width; - - /* Non-nil means indicate lines not displaying text (in a style - like vi). */ - Lisp_Object indicate_empty_lines; - - /* Time stamp updated each time this buffer is displayed in a window. */ - Lisp_Object display_time; - - /* If scrolling the display because point is below the bottom of a - window showing this buffer, try to choose a window start so - that point ends up this number of lines from the top of the - window. Nil means that scrolling method isn't used. */ - Lisp_Object scroll_up_aggressively; - - /* If scrolling the display because point is above the top of a - window showing this buffer, try to choose a window start so - that point ends up this number of lines from the bottom of the - window. Nil means that scrolling method isn't used. */ - Lisp_Object scroll_down_aggressively; - - /* These are so we don't have to recompile everything - the next few times we add a new slot. */ - Lisp_Object extra2, extra3; - }; + /* Alist of (FUNCTION . STRING) for each minor mode enabled in buffer. */ + Lisp_Object minor_modes; + /* t if "self-insertion" should overwrite; `binary' if it should also + overwrite newlines and tabs - for editing executables and the like. */ + Lisp_Object overwrite_mode; + /* non-nil means abbrev mode is on. Expand abbrevs automatically. */ + Lisp_Object abbrev_mode; + /* Display table to use for text in this buffer. */ + Lisp_Object display_table; + /* t means the mark and region are currently active. */ + Lisp_Object mark_active; + + /* Non-nil means the buffer contents are regarded as multi-byte + form of characters, not a binary code. */ + Lisp_Object enable_multibyte_characters; + + /* Coding system to be used for encoding the buffer contents on + saving. */ + Lisp_Object buffer_file_coding_system; + + /* List of symbols naming the file format used for visited file. */ + Lisp_Object file_format; + + /* List of symbols naming the file format used for auto-save file. */ + Lisp_Object auto_save_file_format; + + /* True if the newline position cache and width run cache are + enabled. See search.c and indent.c. */ + Lisp_Object cache_long_line_scans; + + /* If the width run cache is enabled, this table contains the + character widths width_run_cache (see above) assumes. When we + do a thorough redisplay, we compare this against the buffer's + current display table to see whether the display table has + affected the widths of any characters. If it has, we + invalidate the width run cache, and re-initialize width_table. */ + Lisp_Object width_table; + + /* In an indirect buffer, or a buffer that is the base of an + indirect buffer, this holds a marker that records + PT for this buffer when the buffer is not current. */ + Lisp_Object pt_marker; + + /* In an indirect buffer, or a buffer that is the base of an + indirect buffer, this holds a marker that records + BEGV for this buffer when the buffer is not current. */ + Lisp_Object begv_marker; + + /* In an indirect buffer, or a buffer that is the base of an + indirect buffer, this holds a marker that records + ZV for this buffer when the buffer is not current. */ + Lisp_Object zv_marker; + + /* This holds the point value before the last scroll operation. + Explicitly setting point sets this to nil. */ + Lisp_Object point_before_scroll; + + /* Truename of the visited file, or nil. */ + Lisp_Object file_truename; + + /* Invisibility spec of this buffer. + t => any non-nil `invisible' property means invisible. + A list => `invisible' property means invisible + if it is memq in that list. */ + Lisp_Object invisibility_spec; + + /* This is the last window that was selected with this buffer in it, + or nil if that window no longer displays this buffer. */ + Lisp_Object last_selected_window; + + /* Incremented each time the buffer is displayed in a window. */ + Lisp_Object display_count; + + /* Widths of left and right marginal areas for windows displaying + this buffer. */ + Lisp_Object left_margin_cols, right_margin_cols; + + /* Widths of left and right fringe areas for windows displaying + this buffer. */ + Lisp_Object left_fringe_width, right_fringe_width; + + /* Non-nil means fringes are drawn outside display margins; + othersize draw them between margin areas and text. */ + Lisp_Object fringes_outside_margins; + + /* Width and type of scroll bar areas for windows displaying + this buffer. */ + Lisp_Object scroll_bar_width, vertical_scroll_bar_type; + + /* Non-nil means indicate lines not displaying text (in a style + like vi). */ + Lisp_Object indicate_empty_lines; + + /* Non-nil means indicate buffer boundaries and scrolling. */ + Lisp_Object indicate_buffer_boundaries; + + /* Logical to physical fringe bitmap mappings. */ + Lisp_Object fringe_indicator_alist; + + /* Logical to physical cursor bitmap mappings. */ + Lisp_Object fringe_cursor_alist; + + /* Time stamp updated each time this buffer is displayed in a window. */ + Lisp_Object display_time; + + /* If scrolling the display because point is below the bottom of a + window showing this buffer, try to choose a window start so + that point ends up this number of lines from the top of the + window. Nil means that scrolling method isn't used. */ + Lisp_Object scroll_up_aggressively; + + /* If scrolling the display because point is above the top of a + window showing this buffer, try to choose a window start so + that point ends up this number of lines from the bottom of the + window. Nil means that scrolling method isn't used. */ + Lisp_Object scroll_down_aggressively; + + /* Desired cursor type in this buffer. See the doc string of + per-buffer variable `cursor-type'. */ + Lisp_Object cursor_type; + + /* An integer > 0 means put that number of pixels below text lines + in the display of this buffer. */ + Lisp_Object extra_line_spacing; + + /* *Cursor type to display in non-selected windows. + t means to use hollow box cursor. + See `cursor-type' for other values. */ + Lisp_Object cursor_in_non_selected_windows; +}; + /* This points to the current buffer. */ @@ -744,8 +805,8 @@ extern struct buffer buffer_defaults; The value has only one nonzero bit. When a buffer has its own local value for a slot, - the bit for that slot (found in the same slot in this structure) - is turned on in the buffer's local_var_flags slot. + the entry for that slot (found in the same slot in this structure) + is turned on in the buffer's local_flags array. If a slot in this structure is zero, then even though there may be a Lisp-level local variable for the slot, it has no default value, @@ -771,29 +832,49 @@ extern struct buffer buffer_local_symbols; extern struct buffer buffer_local_types; +extern void delete_all_overlays P_ ((struct buffer *)); extern void reset_buffer P_ ((struct buffer *)); -extern void evaporate_overlays P_ ((int)); -extern int overlays_at P_ ((int, int, Lisp_Object **, int *, int *, int *)); +extern void evaporate_overlays P_ ((EMACS_INT)); +extern int overlays_at P_ ((EMACS_INT, int, Lisp_Object **, int *, int *, int *, int)); extern int sort_overlays P_ ((Lisp_Object *, int, struct window *)); -extern void recenter_overlay_lists P_ ((struct buffer *, int)); -extern int overlay_strings P_ ((int, struct window *, unsigned char **)); +extern void recenter_overlay_lists P_ ((struct buffer *, EMACS_INT)); +extern int overlay_strings P_ ((EMACS_INT, struct window *, unsigned char **)); extern void validate_region P_ ((Lisp_Object *, Lisp_Object *)); 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)); -extern void fix_overlays_before P_ ((struct buffer *, int, int)); - +extern void buffer_slot_type_mismatch P_ ((int)) NO_RETURN; +extern void fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT)); +extern void mmap_set_vars P_ ((int)); + +/* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements. + If NEXTP is non-NULL, return next overlay there. + See overlay_at arg CHANGE_REQ for meaning of CHRQ arg. */ + +#define GET_OVERLAYS_AT(posn, overlays, noverlays, nextp, chrq) \ + do { \ + int maxlen = 40; \ + overlays = (Lisp_Object *) alloca (maxlen * sizeof (Lisp_Object)); \ + noverlays = overlays_at (posn, 0, &overlays, &maxlen, \ + nextp, NULL, chrq); \ + if (noverlays > maxlen) \ + { \ + maxlen = noverlays; \ + overlays = (Lisp_Object *) alloca (maxlen * sizeof (Lisp_Object)); \ + noverlays = overlays_at (posn, 0, &overlays, &maxlen, \ + nextp, NULL, chrq); \ + } \ + } while (0) EXFUN (Fbuffer_name, 1); EXFUN (Fget_file_buffer, 1); EXFUN (Fnext_overlay_change, 1); EXFUN (Fdelete_overlay, 1); +EXFUN (Fbuffer_local_value, 2); +EXFUN (Fgenerate_new_buffer_name, 2); /* Functions to call before and after each text change. */ -extern Lisp_Object Vbefore_change_function; -extern Lisp_Object Vafter_change_function; extern Lisp_Object Vbefore_change_functions; extern Lisp_Object Vafter_change_functions; extern Lisp_Object Vfirst_change_hook; @@ -810,38 +891,116 @@ extern Lisp_Object Vtransient_mark_mode; /* Overlays */ /* 1 if the OV is an overlay object. */ + #define OVERLAY_VALID(OV) (OVERLAYP (OV)) /* Return the marker that stands for where OV starts in the buffer. */ + #define OVERLAY_START(OV) (XOVERLAY (OV)->start) /* Return the marker that stands for where OV ends in the buffer. */ + #define OVERLAY_END(OV) (XOVERLAY (OV)->end) +/* Return the plist of overlay OV. */ + +#define OVERLAY_PLIST(OV) XOVERLAY ((OV))->plist + /* Return the actual buffer position for the marker P. We assume you know which buffer it's pointing into. */ #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 + +/*********************************************************************** + Buffer-local Variables + ***********************************************************************/ + +/* Number of per-buffer variables used. */ + +extern int last_per_buffer_idx; + +/* Return the offset in bytes of member VAR of struct buffer + from the start of a buffer structure. */ + +#define PER_BUFFER_VAR_OFFSET(VAR) \ + ((char *) &buffer_local_flags.VAR - (char *) &buffer_local_flags) + +/* Return the index of buffer-local variable VAR. Each per-buffer + variable has an index > 0 associated with it, except when it always + has buffer-local values, in which case the index is -1. If this is + 0, this is a bug and means that the slot of VAR in + buffer_local_flags wasn't intiialized. */ + +#define PER_BUFFER_VAR_IDX(VAR) \ + PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR)) + +/* Value is non-zero if the variable with index IDX has a local value + in buffer B. */ + +#define PER_BUFFER_VALUE_P(B, IDX) \ + (((IDX) < 0 || IDX >= last_per_buffer_idx) \ + ? (abort (), 0) \ + : ((B)->local_flags[IDX] != 0)) + +/* Set whether per-buffer variable with index IDX has a buffer-local + value in buffer B. VAL zero means it hasn't. */ + +#define SET_PER_BUFFER_VALUE_P(B, IDX, VAL) \ + do { \ + if ((IDX) < 0 || (IDX) >= last_per_buffer_idx) \ + abort (); \ + (B)->local_flags[IDX] = (VAL); \ + } while (0) + +/* Return the index value of the per-buffer variable at offset OFFSET + in the buffer structure. + + If the slot OFFSET has a corresponding default value in + buffer_defaults, the index value is positive and has only one + nonzero bit. When a buffer has its own local value for a slot, the + bit for that slot (found in the same slot in this structure) is + turned on in the buffer's local_flags array. + + If the index value is -1, even though there may be a + DEFVAR_PER_BUFFER for the slot, there is no default value for it; + and the corresponding slot in buffer_defaults is not used. + + If the index value is -2, then there is no DEFVAR_PER_BUFFER for + the slot, but there is a default value which is copied into each + new buffer. + + If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is + zero, that is a bug */ + + +#define PER_BUFFER_IDX(OFFSET) \ + XINT (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_flags)) + +/* Return the default value of the per-buffer variable at offset + OFFSET in the buffer structure. */ + +#define PER_BUFFER_DEFAULT(OFFSET) \ + (*(Lisp_Object *)((OFFSET) + (char *) &buffer_defaults)) + +/* Return the buffer-local value of the per-buffer variable at offset + OFFSET in the buffer structure. */ + +#define PER_BUFFER_VALUE(BUFFER, OFFSET) \ + (*(Lisp_Object *)((OFFSET) + (char *) (BUFFER))) + +/* Return the symbol of the per-buffer variable at offset OFFSET in + the buffer structure. */ + +#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) */