/* Header file for the buffer manipulation primitives.
- Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000, 2001
+ Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000, 01, 2003
Free Software Foundation, Inc.
This file is part of GNU Emacs.
/* 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)
/* 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 - BEG_BYTE), \
- _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,
(_fetch_multibyte_char_p \
= (((pos) >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0) \
+ (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)), \
- STRING_CHAR (_fetch_multibyte_char_p, _fetch_multibyte_char_len))
+ STRING_CHAR (_fetch_multibyte_char_p, 0))
\f
/* Define the actual buffer data structures. */
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. */
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. */
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;
+ /* 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. */
/* 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;
/* 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). */
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);
HCoop / bpt / emacs.git / blobdiff