/* Header file for the buffer manipulation primitives.
- Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000, 01, 2003
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
/* 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)
/* 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)
#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)
#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); \
} \
} \
while (0)
-
+
\f
-/* 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)))
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.
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) \
/* 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. */
#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. */
/* Variables used locally in FETCH_MULTIBYTE_CHAR. */
extern unsigned char *_fetch_multibyte_char_p;
-extern int _fetch_multibyte_char_len;
/* Return character code of multi-byte form at position POS. If POS
doesn't point the head of valid multi-byte form, only the byte at
#define FETCH_MULTIBYTE_CHAR(pos) \
(_fetch_multibyte_char_p = (((pos) >= GPT_BYTE ? GAP_SIZE : 0) \
- + (pos) + BEG_ADDR - 1), \
- _fetch_multibyte_char_len \
- = ((pos) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) - (pos), \
- STRING_CHAR (_fetch_multibyte_char_p, _fetch_multibyte_char_len))
+ + (pos) + BEG_ADDR - BEG_BYTE), \
+ STRING_CHAR (_fetch_multibyte_char_p, 0))
+
+/* Return character at position POS. If the current buffer is unibyte
+ and the character is not ASCII, make the returning character
+ multibyte. */
+
+#define FETCH_CHAR_AS_MULTIBYTE(pos) \
+ (!NILP (current_buffer->enable_multibyte_characters) \
+ ? FETCH_MULTIBYTE_CHAR ((pos)) \
+ : unibyte_char_to_multibyte (FETCH_BYTE ((pos))))
+
\f
/* Macros for accessing a character or byte,
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,
#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. */
#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), \
- _fetch_multibyte_char_len \
- = (((pos) >= BUF_GPT_BYTE (buf) ? BUF_ZV_BYTE (buf) : BUF_GPT_BYTE (buf)) \
- - (pos)), \
- STRING_CHAR (_fetch_multibyte_char_p, _fetch_multibyte_char_len))
+ + (pos) + BUF_BEG_ADDR (buf) - BEG_BYTE), \
+ STRING_CHAR (_fetch_multibyte_char_p, 0))
\f
/* Define the actual buffer data structures. */
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;
-
- 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
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. */
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_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. */
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. */
+ /* 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. */
- int last_window_start;
+ EMACS_INT last_window_start;
/* Set nonzero whenever the narrowing is changed in this buffer. */
int clip_changed;
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;
+ /* 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;
- /* Everything from here down must be a Lisp_Object */
+ /* 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;
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;
/* This buffer's category table. */
Lisp_Object category_table;
- /* Values of several buffer-local variables */
+ /* Values of several buffer-local variables. */
/* tab-width is buffer-local so that redisplay can find it
- in buffers that are not current */
+ in buffers that are not current. */
Lisp_Object case_fold_search;
Lisp_Object tab_width;
Lisp_Object fill_column;
/* 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;
saving. */
Lisp_Object buffer_file_coding_system;
- /* List of symbols naming the file format used for visited file. */
+ /* 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
/* 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;
+ 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). */
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
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_ ((int));
-extern int overlays_at P_ ((int, int, Lisp_Object **, int *, 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 fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT));
+extern void mmap_set_vars P_ ((int));
+EXFUN (Fbuffer_live_p, 1);
EXFUN (Fbuffer_name, 1);
EXFUN (Fget_file_buffer, 1);
EXFUN (Fnext_overlay_change, 1);
EXFUN (Fdelete_overlay, 1);
+EXFUN (Fbuffer_local_value, 2);
/* Functions to call before and after each text change. */
extern Lisp_Object Vbefore_change_functions;
/* 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
-
+\f
/***********************************************************************
Buffer-local Variables
***********************************************************************/
HCoop / bpt / emacs.git / blobdiff