#include "window.h"
#include "commands.h"
#include "buffer.h"
+#include "region-cache.h"
#include "indent.h"
#include "blockinput.h"
Lisp_Object Qoverlayp;
-Lisp_Object Qpriority, Qwindow;
+Lisp_Object Qpriority, Qwindow, Qevaporate;
Lisp_Object Qmodification_hooks;
Lisp_Object Qinsert_in_front_hooks;
nsberror (spec)
Lisp_Object spec;
{
- if (XTYPE (spec) == Lisp_String)
+ if (STRINGP (spec))
error ("No buffer named %s", XSTRING (spec)->data);
error ("Invalid buffer argument");
}
return Fmapcar (Qcdr, Vbuffer_alist);
}
+/* Like Fassoc, but use Fstring_equal to compare
+ (which ignores text properties),
+ and don't ever QUIT. */
+
+static Lisp_Object
+assoc_ignore_text_properties (key, list)
+ register Lisp_Object key;
+ Lisp_Object list;
+{
+ register Lisp_Object tail;
+ for (tail = list; !NILP (tail); tail = Fcdr (tail))
+ {
+ register Lisp_Object elt, tem;
+ elt = Fcar (tail);
+ tem = Fstring_equal (Fcar (elt), key);
+ if (!NILP (tem))
+ return elt;
+ }
+ return Qnil;
+}
+
DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0,
"Return the buffer named NAME (a string).\n\
If there is no live buffer named NAME, return nil.\n\
(name)
register Lisp_Object name;
{
- if (XTYPE (name) == Lisp_Buffer)
+ if (BUFFERP (name))
return name;
CHECK_STRING (name, 0);
- return Fcdr (Fassoc (name, Vbuffer_alist));
+ return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist));
}
DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0,
"Return the buffer visiting file FILENAME (a string).\n\
The buffer's `buffer-file-name' must match exactly the expansion of FILENAME.\n\
-If there is no such live buffer, return nil.")
+If there is no such live buffer, return nil.\n\
+See also `find-buffer-visiting'.")
(filename)
register Lisp_Object filename;
{
for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
{
buf = Fcdr (XCONS (tail)->car);
- if (XTYPE (buf) != Lisp_Buffer) continue;
- if (XTYPE (XBUFFER (buf)->filename) != Lisp_String) continue;
+ if (!BUFFERP (buf)) continue;
+ if (!STRINGP (XBUFFER (buf)->filename)) continue;
tem = Fstring_equal (XBUFFER (buf)->filename, filename);
if (!NILP (tem))
return buf;
(name)
register Lisp_Object name;
{
- register Lisp_Object buf, function, tem;
- int count = specpdl_ptr - specpdl;
+ register Lisp_Object buf;
register struct buffer *b;
buf = Fget_buffer (name);
b = (struct buffer *) xmalloc (sizeof (struct buffer));
+ b->size = sizeof (struct buffer) / sizeof (EMACS_INT);
+
+ /* An ordinary buffer uses its own struct buffer_text. */
+ b->text = &b->own_text;
+ b->base_buffer = 0;
+
BUF_GAP_SIZE (b) = 20;
BLOCK_INPUT;
BUFFER_ALLOC (BUF_BEG_ADDR (b), BUF_GAP_SIZE (b));
BUF_ZV (b) = 1;
BUF_Z (b) = 1;
BUF_MODIFF (b) = 1;
+ BUF_SAVE_MODIFF (b) = 1;
+ BUF_INTERVALS (b) = 0;
+
+ b->newline_cache = 0;
+ b->width_run_cache = 0;
+ b->width_table = Qnil;
/* Put this on the chain of all buffers including killed ones. */
b->next = all_buffers;
all_buffers = b;
- b->mark = Fmake_marker ();
- /*b->number = make_number (++buffer_count);*/
+ /* An ordinary buffer normally doesn't need markers
+ to handle BEGV and ZV. */
+ b->pt_marker = Qnil;
+ b->begv_marker = Qnil;
+ b->zv_marker = Qnil;
+
+ name = Fcopy_sequence (name);
+ INITIALIZE_INTERVAL (XSTRING (name), NULL_INTERVAL);
b->name = name;
+
if (XSTRING (name)->data[0] != ' ')
b->undo_list = Qnil;
else
b->undo_list = Qt;
reset_buffer (b);
+ reset_buffer_local_variables (b);
/* Put this in the alist of all live buffers. */
- XSET (buf, Lisp_Buffer, b);
+ XSETBUFFER (buf, b);
Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil));
b->mark = Fmake_marker ();
- b->markers = Qnil;
+ BUF_MARKERS (b) = Qnil;
b->name = name;
+ return buf;
+}
- function = buffer_defaults.major_mode;
- if (NILP (function))
- {
- tem = Fget (current_buffer->major_mode, Qmode_class);
- if (EQ (tem, Qnil))
- function = current_buffer->major_mode;
- }
+DEFUN ("make-indirect-buffer",
+ Fmake_indirect_buffer, Smake_indirect_buffer, 2, 2,
+ "BMake indirect buffer: \nbIndirect to base buffer: ",
+ "Create and return an indirect buffer named NAME, with base buffer BASE.\n\
+BASE should be an existing buffer (or buffer name).")
+ (name, base_buffer)
+ register Lisp_Object name, base_buffer;
+{
+ register Lisp_Object buf;
+ register struct buffer *b;
- if (NILP (function) || EQ (function, Qfundamental_mode))
- return buf;
+ buf = Fget_buffer (name);
+ if (!NILP (buf))
+ error ("Buffer name `%s' is in use", XSTRING (name)->data);
- /* To select a nonfundamental mode,
- select the buffer temporarily and then call the mode function. */
+ base_buffer = Fget_buffer (base_buffer);
+ if (NILP (base_buffer))
+ error ("No such buffer: `%s'",
+ XSTRING (XBUFFER (base_buffer)->name)->data);
- record_unwind_protect (save_excursion_restore, save_excursion_save ());
+ if (XSTRING (name)->size == 0)
+ error ("Empty string for buffer name is not allowed");
- Fset_buffer (buf);
- call0 (function);
+ b = (struct buffer *) xmalloc (sizeof (struct buffer));
+
+ b->size = sizeof (struct buffer) / sizeof (EMACS_INT);
+
+ if (XBUFFER (base_buffer)->base_buffer)
+ b->base_buffer = XBUFFER (base_buffer)->base_buffer;
+ else
+ b->base_buffer = XBUFFER (base_buffer);
+
+ /* Use the base buffer's text object. */
+ b->text = b->base_buffer->text;
+
+ BUF_BEGV (b) = BUF_BEGV (b->base_buffer);
+ BUF_ZV (b) = BUF_ZV (b->base_buffer);
+ BUF_PT (b) = BUF_PT (b->base_buffer);
+
+ b->newline_cache = 0;
+ b->width_run_cache = 0;
+ b->width_table = Qnil;
+
+ /* Put this on the chain of all buffers including killed ones. */
+ b->next = all_buffers;
+ all_buffers = b;
+
+ name = Fcopy_sequence (name);
+ INITIALIZE_INTERVAL (XSTRING (name), NULL_INTERVAL);
+ b->name = name;
+
+ reset_buffer (b);
+ reset_buffer_local_variables (b);
+
+ /* Put this in the alist of all live buffers. */
+ XSETBUFFER (buf, b);
+ Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil));
- return unbind_to (count, buf);
+ b->mark = Fmake_marker ();
+ b->name = name;
+
+ /* Make sure the base buffer has markers for its narrowing. */
+ if (NILP (b->base_buffer->pt_marker))
+ {
+ b->base_buffer->pt_marker = Fmake_marker ();
+ Fset_marker (b->base_buffer->pt_marker,
+ make_number (BUF_PT (b->base_buffer)), base_buffer);
+ }
+ if (NILP (b->base_buffer->begv_marker))
+ {
+ b->base_buffer->begv_marker = Fmake_marker ();
+ Fset_marker (b->base_buffer->begv_marker,
+ make_number (BUF_BEGV (b->base_buffer)), base_buffer);
+ }
+ if (NILP (b->base_buffer->zv_marker))
+ {
+ b->base_buffer->zv_marker = Fmake_marker ();
+ Fset_marker (b->base_buffer->zv_marker,
+ make_number (BUF_ZV (b->base_buffer)), base_buffer);
+ }
+
+ /* Give the indirect buffer markers for its narrowing. */
+ b->pt_marker = Fpoint_marker ();
+ b->begv_marker = Fpoint_min_marker ();
+ b->zv_marker = Fpoint_max_marker ();
+
+ return buf;
}
-/* Reinitialize everything about a buffer except its name and contents. */
+/* Reinitialize everything about a buffer except its name and contents
+ and local variables. */
void
reset_buffer (b)
b->filename = Qnil;
b->directory = (current_buffer) ? current_buffer->directory : Qnil;
b->modtime = 0;
- b->save_modified = 1;
- XFASTINT (b->save_length) = 0;
+ XSETFASTINT (b->save_length, 0);
b->last_window_start = 1;
b->backed_up = Qnil;
b->auto_save_modified = 0;
b->read_only = Qnil;
b->overlays_before = Qnil;
b->overlays_after = Qnil;
- XFASTINT (b->overlay_center) = 1;
+ XSETFASTINT (b->overlay_center, 1);
b->mark_active = Qnil;
-
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
- INITIALIZE_INTERVAL (b, NULL_INTERVAL);
-
- reset_buffer_local_variables(b);
}
+/* Reset buffer B's local variables info.
+ Don't use this on a buffer that has already been in use;
+ it does not treat permanent locals consistently.
+ Instead, use Fkill_all_local_variables. */
+
reset_buffer_local_variables (b)
register struct buffer *b;
{
b->upcase_table = Vascii_upcase_table;
b->case_canon_table = Vascii_canon_table;
b->case_eqv_table = Vascii_eqv_table;
+ b->buffer_file_type = Qnil;
#if 0
b->sort_table = XSTRING (Vascii_sort_table);
b->folding_sort_table = XSTRING (Vascii_folding_sort_table);
for (offset = (char *)&buffer_local_flags.name - (char *)&buffer_local_flags;
offset < sizeof (struct buffer);
- offset += sizeof (Lisp_Object)) /* sizeof int == sizeof Lisp_Object */
- if (*(int *)(offset + (char *) &buffer_local_flags) > 0
- || *(int *)(offset + (char *) &buffer_local_flags) == -2)
- *(Lisp_Object *)(offset + (char *)b) =
- *(Lisp_Object *)(offset + (char *)&buffer_defaults);
+ offset += sizeof (Lisp_Object)) /* sizeof EMACS_INT == sizeof Lisp_Object */
+ {
+ int flag = XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_flags));
+ if (flag > 0 || flag == -2)
+ *(Lisp_Object *)(offset + (char *)b) =
+ *(Lisp_Object *)(offset + (char *)&buffer_defaults);
+ }
}
/* We split this away from generate-new-buffer, because rename-buffer
return XBUFFER (buffer)->filename;
}
+DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer,
+ 0, 1, 0,
+ "Return the base buffer of indirect buffer BUFFER.\n\
+If BUFFER is not indirect, return nil.")
+ (buffer)
+ register Lisp_Object buffer;
+{
+ struct buffer *base;
+ Lisp_Object base_buffer;
+
+ if (NILP (buffer))
+ base = current_buffer->base_buffer;
+ else
+ {
+ CHECK_BUFFER (buffer, 0);
+ base = XBUFFER (buffer)->base_buffer;
+ }
+
+ if (! base)
+ return Qnil;
+ XSETBUFFER (base_buffer, base);
+ return base_buffer;
+}
+
DEFUN ("buffer-local-variables", Fbuffer_local_variables,
Sbuffer_local_variables, 0, 1, 0,
"Return an alist of variables that are buffer-local in BUFFER.\n\
for (offset = (char *)&buffer_local_symbols.name - (char *)&buffer_local_symbols;
offset < sizeof (struct buffer);
- offset += (sizeof (int))) /* sizeof int == sizeof Lisp_Object */
+ offset += (sizeof (EMACS_INT))) /* sizeof EMACS_INT == sizeof Lisp_Object */
{
- mask = *(int *)(offset + (char *) &buffer_local_flags);
+ mask = XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_flags));
if (mask == -1 || (buf->local_var_flags & mask))
- if (XTYPE (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols))
- == Lisp_Symbol)
- result = Fcons (Fcons (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols),
+ if (SYMBOLP (*(Lisp_Object *)(offset
+ + (char *)&buffer_local_symbols)))
+ result = Fcons (Fcons (*((Lisp_Object *)
+ (offset + (char *)&buffer_local_symbols)),
*(Lisp_Object *)(offset + (char *)buf)),
result);
}
buf = XBUFFER (buffer);
}
- return buf->save_modified < BUF_MODIFF (buf) ? Qt : Qnil;
+ return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil;
}
DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
fn = current_buffer->filename;
if (!NILP (fn))
{
- already = current_buffer->save_modified < MODIFF;
+ already = SAVE_MODIFF < MODIFF;
if (!already && !NILP (flag))
lock_file (fn);
else if (already && NILP (flag))
}
#endif /* CLASH_DETECTION */
- current_buffer->save_modified = NILP (flag) ? MODIFF : 0;
+ SAVE_MODIFF = NILP (flag) ? MODIFF : 0;
update_mode_lines++;
return flag;
}
Interactively, you can set UNIQUE with a prefix argument.\n\
We return the name we actually gave the buffer.\n\
This does not change the name of the visited file (if any).")
- (name, unique)
- register Lisp_Object name, unique;
+ (newname, unique)
+ register Lisp_Object newname, unique;
{
register Lisp_Object tem, buf;
- CHECK_STRING (name, 0);
+ CHECK_STRING (newname, 0);
- if (XSTRING (name)->size == 0)
+ if (XSTRING (newname)->size == 0)
error ("Empty string is invalid as a buffer name");
- tem = Fget_buffer (name);
+ tem = Fget_buffer (newname);
/* Don't short-circuit if UNIQUE is t. That is a useful way to rename
the buffer automatically so you can create another with the original name.
It makes UNIQUE equivalent to
- (rename-buffer (generate-new-buffer-name NAME)). */
+ (rename-buffer (generate-new-buffer-name NEWNAME)). */
if (NILP (unique) && XBUFFER (tem) == current_buffer)
return current_buffer->name;
if (!NILP (tem))
{
if (!NILP (unique))
- name = Fgenerate_new_buffer_name (name, current_buffer->name);
+ newname = Fgenerate_new_buffer_name (newname, current_buffer->name);
else
- error ("Buffer name \"%s\" is in use", XSTRING (name)->data);
+ error ("Buffer name `%s' is in use", XSTRING (newname)->data);
}
- current_buffer->name = name;
+ current_buffer->name = newname;
/* Catch redisplay's attention. Unless we do this, the mode lines for
any windows displaying current_buffer will stay unchanged. */
update_mode_lines++;
- XSET (buf, Lisp_Buffer, current_buffer);
- Fsetcar (Frassq (buf, Vbuffer_alist), name);
- if (NILP (current_buffer->filename) && !NILP (current_buffer->auto_save_file_name))
+ XSETBUFFER (buf, current_buffer);
+ Fsetcar (Frassq (buf, Vbuffer_alist), newname);
+ if (NILP (current_buffer->filename)
+ && !NILP (current_buffer->auto_save_file_name))
call0 (intern ("rename-auto-save-file"));
- return name;
+ /* Refetch since that last call may have done GC. */
+ return current_buffer->name;
}
DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 2, 0,
continue;
if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
continue;
+#ifdef MULTI_FRAME
+ /* If the selected frame has a buffer_predicate,
+ disregard buffers that don't fit the predicate. */
+ tem = frame_buffer_predicate ();
+ if (!NILP (tem))
+ {
+ tem = call1 (tem, buf);
+ if (NILP (tem))
+ continue;
+ }
+#endif
+
if (NILP (visible_ok))
tem = Fget_buffer_window (buf, Qt);
else
Lisp_Object real_buffer;
if (NILP (buffer))
- XSET (real_buffer, Lisp_Buffer, current_buffer);
+ XSETBUFFER (real_buffer, current_buffer);
else
{
real_buffer = Fget_buffer (buffer);
Lisp_Object real_buffer;
if (NILP (buffer))
- XSET (real_buffer, Lisp_Buffer, current_buffer);
+ XSETBUFFER (real_buffer, current_buffer);
else
{
real_buffer = Fget_buffer (buffer);
/* Query if the buffer is still modified. */
if (INTERACTIVE && !NILP (b->filename)
- && BUF_MODIFF (b) > b->save_modified)
+ && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
{
GCPRO2 (buf, bufname);
tem = do_yes_or_no_p (format1 ("Buffer %s modified; kill anyway? ",
if (NILP (b->name))
return Qnil;
+ /* When we kill a base buffer, kill all its indirect buffers.
+ We do it at this stage so nothing terrible happens if they
+ ask questions or their hooks get errors. */
+ if (! b->base_buffer)
+ {
+ struct buffer *other;
+
+ GCPRO1 (buf);
+
+ for (other = all_buffers; other; other = other->next)
+ if (other->base_buffer == b)
+ {
+ Lisp_Object buf;
+ XSETBUFFER (buf, other);
+ Fkill_buffer (buf);
+ }
+
+ UNGCPRO;
+ }
+
/* Make this buffer not be current.
In the process, notice if this is the sole visible buffer
and give up if so. */
Vinhibit_quit = tem;
/* Delete any auto-save file, if we saved it in this session. */
- if (XTYPE (b->auto_save_file_name) == Lisp_String
+ if (STRINGP (b->auto_save_file_name)
&& b->auto_save_modified != 0)
{
Lisp_Object tem;
tem = Fsymbol_value (intern ("delete-auto-save-files"));
if (! NILP (tem))
- unlink (XSTRING (b->auto_save_file_name)->data);
+ internal_delete_file (b->auto_save_file_name);
}
- /* Unchain all markers of this buffer
- and leave them pointing nowhere. */
- for (tem = b->markers; !EQ (tem, Qnil); )
+ if (! b->base_buffer)
{
- m = XMARKER (tem);
- m->buffer = 0;
- tem = m->chain;
- m->chain = Qnil;
- }
- b->markers = Qnil;
+ /* Unchain all markers of this buffer
+ and leave them pointing nowhere. */
+ for (tem = BUF_MARKERS (b); !EQ (tem, Qnil); )
+ {
+ m = XMARKER (tem);
+ m->buffer = 0;
+ tem = m->chain;
+ m->chain = Qnil;
+ }
+ BUF_MARKERS (b) = Qnil;
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
- INITIALIZE_INTERVAL (b, NULL_INTERVAL);
- /* Perhaps we should explicitly free the interval tree here... */
+#ifdef USE_TEXT_PROPERTIES
+ BUF_INTERVALS (b) = NULL_INTERVAL;
+#endif
+
+ /* Perhaps we should explicitly free the interval tree here... */
+ }
b->name = Qnil;
+
BLOCK_INPUT;
- BUFFER_FREE (BUF_BEG_ADDR (b));
+ if (! b->base_buffer)
+ BUFFER_FREE (BUF_BEG_ADDR (b));
+
+ if (b->newline_cache)
+ {
+ free_region_cache (b->newline_cache);
+ b->newline_cache = 0;
+ }
+ if (b->width_run_cache)
+ {
+ free_region_cache (b->width_run_cache);
+ b->width_run_cache = 0;
+ }
+ b->width_table = Qnil;
UNBLOCK_INPUT;
b->undo_list = Qnil;
Vbuffer_alist = link;
}
+DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
+ "Set an appropriate major mode for BUFFER, according to `default-major-mode'.\n\
+Use this function before selecting the buffer, since it may need to inspect\n\
+the current buffer's major mode.")
+ (buf)
+ Lisp_Object buf;
+{
+ int count;
+ Lisp_Object function;
+
+ function = buffer_defaults.major_mode;
+ if (NILP (function) && NILP (Fget (current_buffer->major_mode, Qmode_class)))
+ function = current_buffer->major_mode;
+
+ if (NILP (function) || EQ (function, Qfundamental_mode))
+ return Qnil;
+
+ count = specpdl_ptr - specpdl;
+
+ /* To select a nonfundamental mode,
+ select the buffer temporarily and then call the mode function. */
+
+ record_unwind_protect (save_excursion_restore, save_excursion_save ());
+
+ Fset_buffer (buf);
+ call0 (function);
+
+ return unbind_to (count, Qnil);
+}
+
DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ",
"Select buffer BUFFER in the current window.\n\
BUFFER may be a buffer or a buffer name.\n\
if (NILP (bufname))
buf = Fother_buffer (Fcurrent_buffer (), Qnil);
else
- buf = Fget_buffer_create (bufname);
+ {
+ buf = Fget_buffer (bufname);
+ if (NILP (buf))
+ {
+ buf = Fget_buffer_create (bufname);
+ Fset_buffer_major_mode (buf);
+ }
+ }
Fset_buffer (buf);
if (NILP (norecord))
record_buffer (buf);
()
{
register Lisp_Object buf;
- XSET (buf, Lisp_Buffer, current_buffer);
+ XSETBUFFER (buf, current_buffer);
return buf;
}
\f
{
register struct buffer *old_buf;
register Lisp_Object tail, valcontents;
- enum Lisp_Type tem;
+ Lisp_Object tem;
if (current_buffer == b)
return;
current_buffer = b;
last_known_column_point = -1; /* invalidate indentation cache */
+ if (old_buf)
+ {
+ /* Put the undo list back in the base buffer, so that it appears
+ that an indirect buffer shares the undo list of its base. */
+ if (old_buf->base_buffer)
+ old_buf->base_buffer->undo_list = old_buf->undo_list;
+
+ /* If the old current buffer has markers to record PT, BEGV and ZV
+ when it is not current, update them now. */
+ if (! NILP (old_buf->pt_marker))
+ {
+ Lisp_Object obuf;
+ XSETBUFFER (obuf, old_buf);
+ Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf);
+ }
+ if (! NILP (old_buf->begv_marker))
+ {
+ Lisp_Object obuf;
+ XSETBUFFER (obuf, old_buf);
+ Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf);
+ }
+ if (! NILP (old_buf->zv_marker))
+ {
+ Lisp_Object obuf;
+ XSETBUFFER (obuf, old_buf);
+ Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf);
+ }
+ }
+
+ /* Get the undo list from the base buffer, so that it appears
+ that an indirect buffer shares the undo list of its base. */
+ if (b->base_buffer)
+ b->undo_list = b->base_buffer->undo_list;
+
+ /* If the new current buffer has markers to record PT, BEGV and ZV
+ when it is not current, fetch them now. */
+ if (! NILP (b->pt_marker))
+ BUF_PT (b) = marker_position (b->pt_marker);
+ if (! NILP (b->begv_marker))
+ BUF_BEGV (b) = marker_position (b->begv_marker);
+ if (! NILP (b->zv_marker))
+ BUF_ZV (b) = marker_position (b->zv_marker);
+
/* Look down buffer's list of local Lisp variables
to find and update any that forward into C variables. */
for (tail = b->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr)
{
valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value;
- if ((XTYPE (valcontents) == Lisp_Buffer_Local_Value
- || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value)
- && (tem = XTYPE (XCONS (valcontents)->car),
- (tem == Lisp_Boolfwd || tem == Lisp_Intfwd
- || tem == Lisp_Objfwd)))
+ if ((BUFFER_LOCAL_VALUEP (valcontents)
+ || SOME_BUFFER_LOCAL_VALUEP (valcontents))
+ && (tem = XBUFFER_LOCAL_VALUE (valcontents)->car,
+ (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
/* Just reference the variable
to cause it to become set for this buffer. */
Fsymbol_value (XCONS (XCONS (tail)->car)->car);
for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr)
{
valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value;
- if ((XTYPE (valcontents) == Lisp_Buffer_Local_Value
- || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value)
- && (tem = XTYPE (XCONS (valcontents)->car),
- (tem == Lisp_Boolfwd || tem == Lisp_Intfwd
- || tem == Lisp_Objfwd)))
+ if ((BUFFER_LOCAL_VALUEP (valcontents)
+ || SOME_BUFFER_LOCAL_VALUEP (valcontents))
+ && (tem = XBUFFER_LOCAL_VALUE (valcontents)->car,
+ (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
/* Just reference the variable
to cause it to become set for this buffer. */
Fsymbol_value (XCONS (XCONS (tail)->car)->car);
}
}
+/* Switch to buffer B temporarily for redisplay purposes.
+ This avoids certain things thatdon't need to be done within redisplay. */
+
+void
+set_buffer_temp (b)
+ struct buffer *b;
+{
+ register struct buffer *old_buf;
+
+ if (current_buffer == b)
+ return;
+
+ old_buf = current_buffer;
+ current_buffer = b;
+
+ if (old_buf)
+ {
+ /* If the old current buffer has markers to record PT, BEGV and ZV
+ when it is not current, update them now. */
+ if (! NILP (old_buf->pt_marker))
+ {
+ Lisp_Object obuf;
+ XSETBUFFER (obuf, old_buf);
+ Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf);
+ }
+ if (! NILP (old_buf->begv_marker))
+ {
+ Lisp_Object obuf;
+ XSETBUFFER (obuf, old_buf);
+ Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf);
+ }
+ if (! NILP (old_buf->zv_marker))
+ {
+ Lisp_Object obuf;
+ XSETBUFFER (obuf, old_buf);
+ Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf);
+ }
+ }
+
+ /* If the new current buffer has markers to record PT, BEGV and ZV
+ when it is not current, fetch them now. */
+ if (! NILP (b->pt_marker))
+ BUF_PT (b) = marker_position (b->pt_marker);
+ if (! NILP (b->begv_marker))
+ BUF_BEGV (b) = marker_position (b->begv_marker);
+ if (! NILP (b->zv_marker))
+ BUF_ZV (b) = marker_position (b->zv_marker);
+}
+
DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0,
"Make the buffer BUFFER current for editing operations.\n\
BUFFER may be a buffer or the name of an existing buffer.\n\
/* Figure out what buffer we're going to bury. */
if (NILP (buf))
{
- XSET (buf, Lisp_Buffer, current_buffer);
+ XSETBUFFER (buf, current_buffer);
/* If we're burying the current buffer, unshow it. */
Fswitch_to_buffer (Fother_buffer (buf, Qnil), Qnil);
/* Prevent warnings, or suspension of auto saving, that would happen
if future size is less than past size. Use of erase-buffer
implies that the future text is not really related to the past text. */
- XFASTINT (current_buffer->save_length) = 0;
+ XSETFASTINT (current_buffer->save_length, 0);
return Qnil;
}
validate_region (b, e)
register Lisp_Object *b, *e;
{
- register int i;
-
CHECK_NUMBER_COERCE_MARKER (*b, 0);
CHECK_NUMBER_COERCE_MARKER (*e, 1);
if (XINT (*b) > XINT (*e))
{
- i = XFASTINT (*b); /* This is legit even if *b is < 0 */
- *b = *e;
- XFASTINT (*e) = i; /* because this is all we do with i. */
+ Lisp_Object tem;
+ tem = *b; *b = *e; *e = tem;
}
if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e)
args_out_of_range (*b, *e);
}
\f
-static Lisp_Object
-list_buffers_1 (files)
- Lisp_Object files;
-{
- register Lisp_Object tail, tem, buf;
- Lisp_Object col1, col2, col3, minspace;
- register struct buffer *old = current_buffer, *b;
- Lisp_Object desired_point;
- Lisp_Object other_file_symbol;
-
- desired_point = Qnil;
- other_file_symbol = intern ("list-buffers-directory");
-
- XFASTINT (col1) = 19;
- XFASTINT (col2) = 25;
- XFASTINT (col3) = 40;
- XFASTINT (minspace) = 1;
-
- Fset_buffer (Vstandard_output);
- Fbuffer_disable_undo (Vstandard_output);
- current_buffer->read_only = Qnil;
-
- write_string ("\
- MR Buffer Size Mode File\n\
- -- ------ ---- ---- ----\n", -1);
-
- for (tail = Vbuffer_alist; !NILP (tail); tail = Fcdr (tail))
- {
- buf = Fcdr (Fcar (tail));
- b = XBUFFER (buf);
- /* Don't mention the minibuffers. */
- if (XSTRING (b->name)->data[0] == ' ')
- continue;
- /* Optionally don't mention buffers that lack files. */
- if (!NILP (files) && NILP (b->filename))
- continue;
- /* Identify the current buffer. */
- if (b == old)
- XFASTINT (desired_point) = point;
- write_string (b == old ? "." : " ", -1);
- /* Identify modified buffers */
- write_string (BUF_MODIFF (b) > b->save_modified ? "*" : " ", -1);
- write_string (NILP (b->read_only) ? " " : "% ", -1);
- Fprinc (b->name, Qnil);
- Findent_to (col1, make_number (2));
- XFASTINT (tem) = BUF_Z (b) - BUF_BEG (b);
- Fprin1 (tem, Qnil);
- Findent_to (col2, minspace);
- Fprinc (b->mode_name, Qnil);
- Findent_to (col3, minspace);
-
- if (!NILP (b->filename))
- Fprinc (b->filename, Qnil);
- else
- {
- /* No visited file; check local value of list-buffers-directory. */
- Lisp_Object tem;
- set_buffer_internal (b);
- tem = Fboundp (other_file_symbol);
- if (!NILP (tem))
- {
- tem = Fsymbol_value (other_file_symbol);
- Fset_buffer (Vstandard_output);
- if (XTYPE (tem) == Lisp_String)
- Fprinc (tem, Qnil);
- }
- else
- Fset_buffer (Vstandard_output);
- }
- write_string ("\n", -1);
- }
-
- tail = intern ("Buffer-menu-mode");
- if ((tem = Ffboundp (tail), !NILP (tem)))
- call0 (tail);
- set_buffer_internal (old);
- return desired_point;
-}
-
-DEFUN ("list-buffers", Flist_buffers, Slist_buffers, 0, 1, "P",
- "Display a list of names of existing buffers.\n\
-The list is displayed in a buffer named `*Buffer List*'.\n\
-Note that buffers with names starting with spaces are omitted.\n\
-Non-null optional arg FILES-ONLY means mention only file buffers.\n\
-\n\
-The M column contains a * for buffers that are modified.\n\
-The R column contains a % for buffers that are read-only.")
- (files)
- Lisp_Object files;
-{
- Lisp_Object desired_point;
-
- desired_point
- = internal_with_output_to_temp_buffer ("*Buffer List*",
- list_buffers_1, files);
-
- if (NUMBERP (desired_point))
- {
- int count = specpdl_ptr - specpdl;
- record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
- Fset_buffer (build_string ("*Buffer List*"));
- SET_PT (XINT (desired_point));
- return unbind_to (count, Qnil);
- }
- return Qnil;
-}
-
DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables,
0, 0, 0,
"Switch to Fundamental mode by killing current buffer's local variables.\n\
sym = XCONS (XCONS (alist)->car)->car;
/* Need not do anything if some other buffer's binding is now encached. */
- tem = XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->car;
+ tem = XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->car;
if (XBUFFER (tem) == current_buffer)
{
/* Symbol is set up for this buffer's old local value.
Set it up for the current buffer with the default value. */
- tem = XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->cdr;
+ tem = XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->cdr;
/* Store the symbol's current value into the alist entry
it is currently set up for. This is so that, if the
local is marked permanent, and we make it local again below,
we don't lose the value. */
XCONS (XCONS (tem)->car)->cdr
- = do_symval_forwarding (XCONS (XSYMBOL (sym)->value)->car);
+ = do_symval_forwarding (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->car);
/* Switch to the symbol's default-value alist entry. */
XCONS (tem)->car = tem;
/* Mark it as current for the current buffer. */
- XCONS (XCONS (XSYMBOL (sym)->value)->cdr)->car = Fcurrent_buffer ();
+ XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->car
+ = Fcurrent_buffer ();
/* Store the current value into any forwarding in the symbol. */
- store_symval_forwarding (sym, XCONS (XSYMBOL (sym)->value)->car,
+ store_symval_forwarding (sym, XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->car,
XCONS (tem)->cdr);
}
}
Store in *LEN_PTR the size allocated for the vector.
Store in *NEXT_PTR the next position after POS where an overlay starts,
or ZV if there are no more overlays.
+ Store in *PREV_PTR the previous position after POS where an overlay ends,
+ or BEGV if there are no previous overlays.
+ NEXT_PTR and/or PREV_PTR may be 0, meaning don't store that info.
*VEC_PTR and *LEN_PTR should contain a valid vector and size
when this function is called.
But we still return the total number of overlays. */
int
-overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr)
+overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr)
int pos;
int extend;
Lisp_Object **vec_ptr;
int *len_ptr;
int *next_ptr;
+ int *prev_ptr;
{
Lisp_Object tail, overlay, start, end, result;
int idx = 0;
int len = *len_ptr;
Lisp_Object *vec = *vec_ptr;
int next = ZV;
+ int prev = BEGV;
int inhibit_storing = 0;
for (tail = current_buffer->overlays_before;
- XGCTYPE (tail) == Lisp_Cons;
+ GC_CONSP (tail);
tail = XCONS (tail)->cdr)
{
- int startpos;
+ int startpos, endpos;
overlay = XCONS (tail)->car;
- if (XGCTYPE (overlay) != Lisp_Overlay)
- abort ();
start = OVERLAY_START (overlay);
end = OVERLAY_END (overlay);
- if (OVERLAY_POSITION (end) <= pos)
- break;
+ endpos = OVERLAY_POSITION (end);
+ if (endpos < pos)
+ {
+ if (prev < endpos)
+ prev = endpos;
+ break;
+ }
+ if (endpos == pos)
+ continue;
startpos = OVERLAY_POSITION (start);
if (startpos <= pos)
{
}
for (tail = current_buffer->overlays_after;
- XGCTYPE (tail) == Lisp_Cons;
+ GC_CONSP (tail);
tail = XCONS (tail)->cdr)
{
- int startpos;
+ int startpos, endpos;
overlay = XCONS (tail)->car;
- if (XGCTYPE (overlay) != Lisp_Overlay)
- abort ();
start = OVERLAY_START (overlay);
end = OVERLAY_END (overlay);
next = startpos;
break;
}
- if (pos < OVERLAY_POSITION (end))
+ endpos = OVERLAY_POSITION (end);
+ if (pos < endpos)
{
if (idx == len)
{
vec[idx] = overlay;
idx++;
}
+ else if (endpos < pos && endpos > prev)
+ prev = endpos;
}
- *next_ptr = next;
+ if (next_ptr)
+ *next_ptr = next;
+ if (prev_ptr)
+ *prev_ptr = prev;
return idx;
}
\f
Lisp_Object window;
window = Foverlay_get (overlay, Qwindow);
- if (XTYPE (window) == Lisp_Window && XWINDOW (window) != w)
+ if (WINDOWP (window) && XWINDOW (window) != w)
continue;
}
}
}
- XFASTINT (buf->overlay_center) = pos;
+ XSETFASTINT (buf->overlay_center, pos);
}
/* Fix up overlays that were garbled as a result of permuting markers
struct buffer *b;
if (NILP (buffer))
- XSET (buffer, Lisp_Buffer, current_buffer);
+ XSETBUFFER (buffer, current_buffer);
else
CHECK_BUFFER (buffer, 2);
if (MARKERP (beg)
beg = Fset_marker (Fmake_marker (), beg, buffer);
end = Fset_marker (Fmake_marker (), end, buffer);
- overlay = Fcons (Fcons (beg, end), Qnil);
- XSETTYPE (overlay, Lisp_Overlay);
+ overlay = allocate_misc ();
+ XMISC (overlay)->type = Lisp_Misc_Overlay;
+ XOVERLAY (overlay)->start = beg;
+ XOVERLAY (overlay)->end = end;
+ XOVERLAY (overlay)->plist = Qnil;
/* Put the new overlay on the wrong list. */
end = OVERLAY_END (overlay);
if (NILP (buffer))
buffer = Fmarker_buffer (OVERLAY_START (overlay));
if (NILP (buffer))
- XSET (buffer, Lisp_Buffer, current_buffer);
+ XSETBUFFER (buffer, current_buffer);
CHECK_BUFFER (buffer, 3);
if (MARKERP (beg)
CHECK_NUMBER_COERCE_MARKER (beg, 1);
CHECK_NUMBER_COERCE_MARKER (end, 1);
- specbind (Qinhibit_quit, Qt);
+ if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate)))
+ return Fdelete_overlay (overlay);
if (XINT (beg) > XINT (end))
{
temp = beg; beg = end; end = temp;
}
+ specbind (Qinhibit_quit, Qt);
+
obuffer = Fmarker_buffer (OVERLAY_START (overlay));
b = XBUFFER (buffer);
ob = XBUFFER (obuffer);
{
CHECK_OVERLAY (overlay, 0);
- return Fcopy_sequence (Fcdr_safe (XCONS (overlay)->cdr));
+ return Fcopy_sequence (XOVERLAY (overlay)->plist);
}
\f
Lisp_Object pos;
{
int noverlays;
- int endpos;
Lisp_Object *overlay_vec;
int len;
Lisp_Object result;
/* Put all the overlays we want in a vector in overlay_vec.
Store the length in len. */
- noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, &endpos);
+ noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, NULL, NULL);
/* Make a list of them all. */
result = Flist (noverlays, overlay_vec);
int endpos;
Lisp_Object *overlay_vec;
int len;
- Lisp_Object result;
int i;
CHECK_NUMBER_COERCE_MARKER (pos, 0);
/* Put all the overlays we want in a vector in overlay_vec.
Store the length in len.
endpos gets the position where the next overlay starts. */
- noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, &endpos);
+ noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, &endpos, NULL);
/* If any of these overlays ends before endpos,
use its ending point instead. */
xfree (overlay_vec);
return make_number (endpos);
}
+
+DEFUN ("previous-overlay-change", Fprevious_overlay_change,
+ Sprevious_overlay_change, 1, 1, 0,
+ "Return the previous position before POS where an overlay starts or ends.\n\
+If there are no more overlay boundaries after POS, return (point-min).")
+ (pos)
+ Lisp_Object pos;
+{
+ int noverlays;
+ int prevpos;
+ Lisp_Object *overlay_vec;
+ int len;
+ int i;
+
+ CHECK_NUMBER_COERCE_MARKER (pos, 0);
+
+ len = 10;
+ overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
+
+ /* Put all the overlays we want in a vector in overlay_vec.
+ Store the length in len.
+ prevpos gets the position of an overlay end. */
+ noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len, NULL, &prevpos);
+
+ /* If any of these overlays starts before endpos,
+ maybe use its starting point instead. */
+ for (i = 0; i < noverlays; i++)
+ {
+ Lisp_Object ostart;
+ int ostartpos;
+
+ ostart = OVERLAY_START (overlay_vec[i]);
+ ostartpos = OVERLAY_POSITION (ostart);
+ if (ostartpos > prevpos && ostartpos < XINT (pos))
+ prevpos = ostartpos;
+ }
+
+ xfree (overlay_vec);
+ return make_number (prevpos);
+}
\f
/* These functions are for debugging overlays. */
(overlay, prop)
Lisp_Object overlay, prop;
{
- Lisp_Object plist;
+ Lisp_Object plist, fallback;
CHECK_OVERLAY (overlay, 0);
- for (plist = Fcdr_safe (XCONS (overlay)->cdr);
+ fallback = Qnil;
+
+ for (plist = XOVERLAY (overlay)->plist;
CONSP (plist) && CONSP (XCONS (plist)->cdr);
plist = XCONS (XCONS (plist)->cdr)->cdr)
{
if (EQ (XCONS (plist)->car, prop))
return XCONS (XCONS (plist)->cdr)->car;
+ else if (EQ (XCONS (plist)->car, Qcategory))
+ {
+ Lisp_Object tem;
+ tem = Fcar (Fcdr (plist));
+ if (SYMBOLP (tem))
+ fallback = Fget (tem, prop);
+ }
}
- return Qnil;
+ return fallback;
}
DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
(overlay, prop, value)
Lisp_Object overlay, prop, value;
{
- Lisp_Object plist, tail, buffer;
+ Lisp_Object tail, buffer;
+ int changed;
CHECK_OVERLAY (overlay, 0);
buffer = Fmarker_buffer (OVERLAY_START (overlay));
- plist = Fcdr_safe (XCONS (overlay)->cdr);
-
- for (tail = plist;
+ for (tail = XOVERLAY (overlay)->plist;
CONSP (tail) && CONSP (XCONS (tail)->cdr);
tail = XCONS (XCONS (tail)->cdr)->cdr)
if (EQ (XCONS (tail)->car, prop))
{
- /* If actually changing the property, mark redisplay needed. */
- if (! NILP (buffer) && !EQ (XCONS (XCONS (tail)->cdr)->car, value))
- redisplay_region (XBUFFER (buffer),
- marker_position (OVERLAY_START (overlay)),
- marker_position (OVERLAY_END (overlay)));
-
- return XCONS (XCONS (tail)->cdr)->car = value;
+ changed = !EQ (XCONS (XCONS (tail)->cdr)->car, value);
+ XCONS (XCONS (tail)->cdr)->car = value;
+ goto found;
}
-
- /* Actually changing the property; mark redisplay needed. */
+ /* It wasn't in the list, so add it to the front. */
+ changed = !NILP (value);
+ XOVERLAY (overlay)->plist
+ = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist));
+ found:
if (! NILP (buffer))
- redisplay_region (XBUFFER (buffer),
- marker_position (OVERLAY_START (overlay)),
- marker_position (OVERLAY_END (overlay)));
-
- if (! CONSP (XCONS (overlay)->cdr))
- XCONS (overlay)->cdr = Fcons (Qnil, Qnil);
-
- XCONS (XCONS (overlay)->cdr)->cdr
- = Fcons (prop, Fcons (value, plist));
-
+ {
+ if (changed)
+ redisplay_region (XBUFFER (buffer),
+ marker_position (OVERLAY_START (overlay)),
+ marker_position (OVERLAY_END (overlay)));
+ if (EQ (prop, Qevaporate) && ! NILP (value)
+ && (OVERLAY_POSITION (OVERLAY_START (overlay))
+ == OVERLAY_POSITION (OVERLAY_END (overlay))))
+ Fdelete_overlay (overlay);
+ }
return value;
}
\f
/* Run the modification-hooks of overlays that include
any part of the text in START to END.
Run the insert-before-hooks of overlay starting at END,
- and the insert-after-hooks of overlay ending at START. */
+ and the insert-after-hooks of overlay ending at START.
+
+ This is called both before and after the modification.
+ AFTER is nonzero when we call after the modification.
+
+ ARG1, ARG2, ARG3 are arguments to pass to the hook functions. */
void
-verify_overlay_modification (start, end)
+report_overlay_modification (start, end, after, arg1, arg2, arg3)
Lisp_Object start, end;
+ int after;
+ Lisp_Object arg1, arg2, arg3;
{
Lisp_Object prop, overlay, tail;
int insertion = EQ (start, end);
int tail_copied;
- struct gcpro gcpro1, gcpro2;
+ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
overlay = Qnil;
tail = Qnil;
- GCPRO2 (overlay, tail);
+ GCPRO5 (overlay, tail, arg1, arg2, arg3);
tail_copied = 0;
for (tail = current_buffer->overlays_before;
if (!tail_copied)
tail = Fcopy_sequence (tail);
tail_copied = 1;
- call_overlay_mod_hooks (prop, overlay, start, end);
+ call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
}
}
if (XFASTINT (start) == endpos && insertion)
if (!tail_copied)
tail = Fcopy_sequence (tail);
tail_copied = 1;
- call_overlay_mod_hooks (prop, overlay, start, end);
+ call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
}
}
/* Test for intersecting intervals. This does the right thing
if (!tail_copied)
tail = Fcopy_sequence (tail);
tail_copied = 1;
- call_overlay_mod_hooks (prop, overlay, start, end);
+ call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
}
}
}
if (!tail_copied)
tail = Fcopy_sequence (tail);
tail_copied = 1;
- call_overlay_mod_hooks (prop, overlay, start, end);
+ call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
}
}
if (XFASTINT (start) == endpos && insertion)
if (!tail_copied)
tail = Fcopy_sequence (tail);
tail_copied = 1;
- call_overlay_mod_hooks (prop, overlay, start, end);
+ call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
}
}
/* Test for intersecting intervals. This does the right thing
if (!tail_copied)
tail = Fcopy_sequence (tail);
tail_copied = 1;
- call_overlay_mod_hooks (prop, overlay, start, end);
+ call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
}
}
}
}
static void
-call_overlay_mod_hooks (list, overlay, start, end)
- Lisp_Object list, overlay, start, end;
+call_overlay_mod_hooks (list, overlay, after, arg1, arg2, arg3)
+ Lisp_Object list, overlay;
+ int after;
+ Lisp_Object arg1, arg2, arg3;
{
- struct gcpro gcpro1;
- GCPRO1 (list);
+ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
+ GCPRO4 (list, arg1, arg2, arg3);
while (!NILP (list))
{
- call3 (Fcar (list), overlay, start, end);
+ if (NILP (arg3))
+ call4 (Fcar (list), overlay, after ? Qt : Qnil, arg1, arg2);
+ else
+ call5 (Fcar (list), overlay, after ? Qt : Qnil, arg1, arg2, arg3);
list = Fcdr (list);
}
UNGCPRO;
}
+
+/* Delete any zero-sized overlays at position POS, if the `evaporate'
+ property is set. */
+void
+evaporate_overlays (pos)
+ int pos;
+{
+ Lisp_Object tail, overlay, hit_list;
+
+ hit_list = Qnil;
+ if (pos <= XFASTINT (current_buffer->overlay_center))
+ for (tail = current_buffer->overlays_before; CONSP (tail);
+ tail = XCONS (tail)->cdr)
+ {
+ int endpos;
+ overlay = XCONS (tail)->car;
+ endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+ if (endpos < pos)
+ break;
+ if (endpos == pos && OVERLAY_POSITION (OVERLAY_START (overlay)) == pos
+ && Foverlay_get (overlay, Qevaporate))
+ hit_list = Fcons (overlay, hit_list);
+ }
+ else
+ for (tail = current_buffer->overlays_after; CONSP (tail);
+ tail = XCONS (tail)->cdr)
+ {
+ int startpos;
+ overlay = XCONS (tail)->car;
+ startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
+ if (startpos > pos)
+ break;
+ if (startpos == pos && OVERLAY_POSITION (OVERLAY_END (overlay)) == pos
+ && Foverlay_get (overlay, Qevaporate))
+ hit_list = Fcons (overlay, hit_list);
+ }
+ for (; CONSP (hit_list); hit_list = XCONS (hit_list)->cdr)
+ Fdelete_overlay (XCONS (hit_list)->car);
+}
\f
-/* Somebody has tried to store NEWVAL into the buffer-local slot with
- offset XUINT (valcontents), and NEWVAL has an unacceptable type. */
+/* Somebody has tried to store a value with an unacceptable type
+ into the buffer-local slot with offset OFFSET. */
void
-buffer_slot_type_mismatch (valcontents, newval)
- Lisp_Object valcontents, newval;
+buffer_slot_type_mismatch (offset)
+ int offset;
{
- unsigned int offset = XUINT (valcontents);
- unsigned char *symbol_name =
- (XSYMBOL (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols))
- ->name->data);
+ Lisp_Object sym;
char *type_name;
-
+ sym = *(Lisp_Object *)(offset + (char *)&buffer_local_symbols);
switch (XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_types)))
{
case Lisp_Int: type_name = "integers"; break;
case Lisp_String: type_name = "strings"; break;
- case Lisp_Marker: type_name = "markers"; break;
case Lisp_Symbol: type_name = "symbols"; break;
- case Lisp_Cons: type_name = "lists"; break;
- case Lisp_Vector: type_name = "vectors"; break;
default:
abort ();
}
error ("only %s should be stored in the buffer-local variable %s",
- type_name, symbol_name);
+ type_name, XSYMBOL (sym)->name->data);
}
\f
init_buffer_once ()
/* Make sure all markable slots in buffer_defaults
are initialized reasonably, so mark_buffer won't choke. */
reset_buffer (&buffer_defaults);
+ reset_buffer_local_variables (&buffer_defaults);
reset_buffer (&buffer_local_symbols);
- XSET (Vbuffer_defaults, Lisp_Buffer, &buffer_defaults);
- XSET (Vbuffer_local_symbols, Lisp_Buffer, &buffer_local_symbols);
+ reset_buffer_local_variables (&buffer_local_symbols);
+ /* Prevent GC from getting confused. */
+ buffer_defaults.text = &buffer_defaults.own_text;
+ buffer_local_symbols.text = &buffer_local_symbols.own_text;
+#ifdef USE_TEXT_PROPERTIES
+ BUF_INTERVALS (&buffer_defaults) = 0;
+ BUF_INTERVALS (&buffer_local_symbols) = 0;
+#endif
+ XSETBUFFER (Vbuffer_defaults, &buffer_defaults);
+ XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols);
/* Set up the default values of various buffer slots. */
/* Must do these before making the first buffer! */
buffer_defaults.mark_active = Qnil;
buffer_defaults.overlays_before = Qnil;
buffer_defaults.overlays_after = Qnil;
- XFASTINT (buffer_defaults.overlay_center) = 1;
+ XSETFASTINT (buffer_defaults.overlay_center, 1);
- XFASTINT (buffer_defaults.tab_width) = 8;
+ XSETFASTINT (buffer_defaults.tab_width, 8);
buffer_defaults.truncate_lines = Qnil;
buffer_defaults.ctl_arrow = Qt;
-#ifdef MSDOS
+#ifdef DOS_NT
buffer_defaults.buffer_file_type = Qnil; /* TEXT */
#endif
- XFASTINT (buffer_defaults.fill_column) = 70;
- XFASTINT (buffer_defaults.left_margin) = 0;
+ XSETFASTINT (buffer_defaults.fill_column, 70);
+ XSETFASTINT (buffer_defaults.left_margin, 0);
+ buffer_defaults.cache_long_line_scans = Qnil;
/* Assign the local-flags to the slots that have default values.
The local flag is a bit that is used in the buffer
The local flag bits are in the local_var_flags slot of the buffer. */
/* Nothing can work if this isn't true */
- if (sizeof (int) != sizeof (Lisp_Object)) abort ();
+ if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort ();
/* 0 means not a lisp var, -1 means always local, else mask */
bzero (&buffer_local_flags, sizeof buffer_local_flags);
- XFASTINT (buffer_local_flags.filename) = -1;
- XFASTINT (buffer_local_flags.directory) = -1;
- XFASTINT (buffer_local_flags.backed_up) = -1;
- XFASTINT (buffer_local_flags.save_length) = -1;
- XFASTINT (buffer_local_flags.auto_save_file_name) = -1;
- XFASTINT (buffer_local_flags.read_only) = -1;
- XFASTINT (buffer_local_flags.major_mode) = -1;
- XFASTINT (buffer_local_flags.mode_name) = -1;
- XFASTINT (buffer_local_flags.undo_list) = -1;
- XFASTINT (buffer_local_flags.mark_active) = -1;
-
- XFASTINT (buffer_local_flags.mode_line_format) = 1;
- XFASTINT (buffer_local_flags.abbrev_mode) = 2;
- XFASTINT (buffer_local_flags.overwrite_mode) = 4;
- XFASTINT (buffer_local_flags.case_fold_search) = 8;
- XFASTINT (buffer_local_flags.auto_fill_function) = 0x10;
- XFASTINT (buffer_local_flags.selective_display) = 0x20;
+ XSETINT (buffer_local_flags.filename, -1);
+ XSETINT (buffer_local_flags.directory, -1);
+ XSETINT (buffer_local_flags.backed_up, -1);
+ XSETINT (buffer_local_flags.save_length, -1);
+ XSETINT (buffer_local_flags.auto_save_file_name, -1);
+ XSETINT (buffer_local_flags.read_only, -1);
+ XSETINT (buffer_local_flags.major_mode, -1);
+ XSETINT (buffer_local_flags.mode_name, -1);
+ XSETINT (buffer_local_flags.undo_list, -1);
+ XSETINT (buffer_local_flags.mark_active, -1);
+
+ XSETFASTINT (buffer_local_flags.mode_line_format, 1);
+ XSETFASTINT (buffer_local_flags.abbrev_mode, 2);
+ XSETFASTINT (buffer_local_flags.overwrite_mode, 4);
+ XSETFASTINT (buffer_local_flags.case_fold_search, 8);
+ XSETFASTINT (buffer_local_flags.auto_fill_function, 0x10);
+ XSETFASTINT (buffer_local_flags.selective_display, 0x20);
#ifndef old
- XFASTINT (buffer_local_flags.selective_display_ellipses) = 0x40;
+ XSETFASTINT (buffer_local_flags.selective_display_ellipses, 0x40);
#endif
- XFASTINT (buffer_local_flags.tab_width) = 0x80;
- XFASTINT (buffer_local_flags.truncate_lines) = 0x100;
- XFASTINT (buffer_local_flags.ctl_arrow) = 0x200;
- XFASTINT (buffer_local_flags.fill_column) = 0x400;
- XFASTINT (buffer_local_flags.left_margin) = 0x800;
- XFASTINT (buffer_local_flags.abbrev_table) = 0x1000;
- XFASTINT (buffer_local_flags.display_table) = 0x2000;
- XFASTINT (buffer_local_flags.syntax_table) = 0x8000;
-#ifdef MSDOS
- XFASTINT (buffer_local_flags.buffer_file_type) = 0x4000;
+ XSETFASTINT (buffer_local_flags.tab_width, 0x80);
+ XSETFASTINT (buffer_local_flags.truncate_lines, 0x100);
+ XSETFASTINT (buffer_local_flags.ctl_arrow, 0x200);
+ XSETFASTINT (buffer_local_flags.fill_column, 0x400);
+ XSETFASTINT (buffer_local_flags.left_margin, 0x800);
+ XSETFASTINT (buffer_local_flags.abbrev_table, 0x1000);
+ XSETFASTINT (buffer_local_flags.display_table, 0x2000);
+ XSETFASTINT (buffer_local_flags.syntax_table, 0x8000);
+ XSETFASTINT (buffer_local_flags.cache_long_line_scans, 0x10000);
+#ifdef DOS_NT
+ XSETFASTINT (buffer_local_flags.buffer_file_type, 0x4000);
#endif
Vbuffer_alist = Qnil;
char *pwd;
struct stat dotstat, pwdstat;
Lisp_Object temp;
+ int rc;
Fset_buffer (Fget_buffer_create (build_string ("*scratch*")));
/* If PWD is accurate, use it instead of calling getwd. This is faster
when PWD is right, and may avoid a fatal error. */
- if ((pwd = getenv ("PWD")) != 0 && *pwd == '/'
+ if ((pwd = getenv ("PWD")) != 0 && IS_DIRECTORY_SEP (*pwd)
&& stat (pwd, &pwdstat) == 0
&& stat (".", &dotstat) == 0
&& dotstat.st_ino == pwdstat.st_ino
&& strlen (pwd) < MAXPATHLEN)
strcpy (buf, pwd);
else if (getwd (buf) == 0)
- fatal ("`getwd' failed: %s.\n", buf);
+ fatal ("`getwd' failed: %s\n", buf);
#ifndef VMS
/* Maybe this should really use some standard subroutine
whose definition is filename syntax dependent. */
- if (buf[strlen (buf) - 1] != '/')
- strcat (buf, "/");
+ rc = strlen (buf);
+ if (!(IS_DIRECTORY_SEP (buf[rc - 1])))
+ {
+ buf[rc] = DIRECTORY_SEP;
+ buf[rc + 1] = '\0';
+ }
#endif /* not VMS */
current_buffer->directory = build_string (buf);
staticpro (&Qpermanent_local);
staticpro (&Qkill_buffer_hook);
staticpro (&Qoverlayp);
+ Qevaporate = intern ("evaporate");
+ staticpro (&Qevaporate);
staticpro (&Qmodification_hooks);
Qmodification_hooks = intern ("modification-hooks");
staticpro (&Qinsert_in_front_hooks);
"Default value of `case-fold-search' for buffers that don't override it.\n\
This is the same as (default-value 'case-fold-search).");
-#ifdef MSDOS
+#ifdef DOS_NT
DEFVAR_LISP_NOPRO ("default-buffer-file-type",
&buffer_defaults.buffer_file_type,
"Default file type for buffers that do not override it.\n\
`truncate-partial-width-windows' if that variable is non-nil\n\
and this buffer is not full-frame width.");
-#ifdef MSDOS
+#ifdef DOS_NT
DEFVAR_PER_BUFFER ("buffer-file-type", ¤t_buffer->buffer_file_type,
Qnil,
- "*If visited file is text, nil; otherwise, t.");
+ "Non-nil if the visited file is a binary file.\n\
+This variable is meaningful on MS-DOG and Windows NT.\n\
+On those systems, it is automatically local in every buffer.\n\
+On other systems, this variable is normally always nil.")
#endif
DEFVAR_PER_BUFFER ("default-directory", ¤t_buffer->directory,
The first 256 elements control how to display each possible text character.\n\
Each value should be a vector of characters or nil;\n\
nil means display the character in the default fashion.\n\
-The remaining five elements control the display of\n\
+The remaining six elements control the display of\n\
the end of a truncated screen line (element 256, a single character);\n\
the end of a continued line (element 257, a single character);\n\
the escape character used to display character codes in octal\n\
the character used as an arrow for control characters (element 259,\n\
a single character);\n\
the decoration indicating the presence of invisible lines (element 260,\n\
- a vector of characters).\n\
+ a vector of characters);\n\
+ the character used to draw the border between side-by-side windows\n\
+ (element 261, a single character).\n\
If this variable is nil, the value of `standard-display-table' is used.\n\
Each window can have its own, overriding display table.");
#endif
from (abs POSITION). If POSITION is positive, point was at the front\n\
of the text being deleted; if negative, point was at the end.\n\
\n\
-An entry (t HIGHWORD LOWWORD) indicates that the buffer had been\n\
-previously unmodified. HIGHWORD and LOWWORD are the high and low\n\
-16-bit words of the buffer's modification count at the time. If the\n\
-modification count of the most recent save is different, this entry is\n\
+An entry (t HIGH . LOW) indicates that the buffer previously had\n\
+\"unmodified\" status. HIGH and LOW are the high and low 16-bit portions\n\
+of the visited file's modification time, as of that time. If the\n\
+modification time of the most recent save is different, this entry is\n\
obsolete.\n\
\n\
-An entry (nil PROP VAL BEG . END) indicates that a text property\n\
-was modified between BEG and END. PROP is the property name,\n\
-and VAL is the old value.\n\
+An entry (nil PROPERTY VALUE BEG . END) indicates that a text property\n\
+was modified between BEG and END. PROPERTY is the property name,\n\
+and VALUE is the old value.\n\
\n\
An entry of the form POSITION indicates that point was at the buffer\n\
location given by the integer. Undoing an entry of this form places\n\
"Non-nil means the mark and region are currently active in this buffer.\n\
Automatically local in all buffers.");
+ DEFVAR_PER_BUFFER ("cache-long-line-scans", ¤t_buffer->cache_long_line_scans, Qnil,
+ "Non-nil means that Emacs should use caches to handle long lines more quickly.\n\
+This variable is buffer-local, in all buffers.\n\
+\n\
+Normally, the line-motion functions work by scanning the buffer for\n\
+newlines. Columnar operations (like move-to-column and\n\
+compute-motion) also work by scanning the buffer, summing character\n\
+widths as they go. This works well for ordinary text, but if the\n\
+buffer's lines are very long (say, more than 500 characters), these\n\
+motion functions will take longer to execute. Emacs may also take\n\
+longer to update the display.\n\
+\n\
+If cache-long-line-scans is non-nil, these motion functions cache the\n\
+results of their scans, and consult the cache to avoid rescanning\n\
+regions of the buffer until the text is modified. The caches are most\n\
+beneficial when they prevent the most searching---that is, when the\n\
+buffer contains long lines and large regions of characters with the\n\
+same, fixed screen width.\n\
+\n\
+When cache-long-line-scans is non-nil, processing short lines will\n\
+become slightly slower (because of the overhead of consulting the\n\
+cache), and the caches will use memory roughly proportional to the\n\
+number of newlines and characters whose screen width varies.\n\
+\n\
+The caches require no explicit maintenance; their accuracy is\n\
+maintained internally by the Emacs primitives. Enabling or disabling\n\
+the cache should not affect the behavior of any of the motion\n\
+functions; it should only affect their performance.");
+
DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode,
"*Non-nil means deactivate the mark when the buffer contents change.");
Vtransient_mark_mode = Qnil;
defsubr (&Sget_buffer);
defsubr (&Sget_file_buffer);
defsubr (&Sget_buffer_create);
+ defsubr (&Smake_indirect_buffer);
defsubr (&Sgenerate_new_buffer_name);
defsubr (&Sbuffer_name);
/*defsubr (&Sbuffer_number);*/
defsubr (&Sbuffer_file_name);
+ defsubr (&Sbuffer_base_buffer);
defsubr (&Sbuffer_local_variables);
defsubr (&Sbuffer_modified_p);
defsubr (&Sset_buffer_modified_p);
defsubr (&Sbuffer_enable_undo);
defsubr (&Skill_buffer);
defsubr (&Serase_buffer);
+ defsubr (&Sset_buffer_major_mode);
defsubr (&Sswitch_to_buffer);
defsubr (&Spop_to_buffer);
defsubr (&Scurrent_buffer);
defsubr (&Sset_buffer);
defsubr (&Sbarf_if_buffer_read_only);
defsubr (&Sbury_buffer);
- defsubr (&Slist_buffers);
defsubr (&Skill_all_local_variables);
defsubr (&Soverlayp);
defsubr (&Soverlay_properties);
defsubr (&Soverlays_at);
defsubr (&Snext_overlay_change);
+ defsubr (&Sprevious_overlay_change);
defsubr (&Soverlay_recenter);
defsubr (&Soverlay_lists);
defsubr (&Soverlay_get);
{
initial_define_key (control_x_map, 'b', "switch-to-buffer");
initial_define_key (control_x_map, 'k', "kill-buffer");
- initial_define_key (control_x_map, Ctl ('B'), "list-buffers");
/* This must not be in syms_of_buffer, because Qdisabled is not
initialized when that function gets called. */
HCoop / bpt / emacs.git / blobdiff