/* Buffer insertion/deletion and gap motion for GNU Emacs.
- Copyright (C) 1985-1986, 1993-1995, 1997-2011
+ Copyright (C) 1985-1986, 1993-1995, 1997-2012
Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include <config.h>
#include <setjmp.h>
+
+#include <intprops.h>
+
#include "lisp.h"
#include "intervals.h"
#include "buffer.h"
int inherit);
static void gap_left (EMACS_INT charpos, EMACS_INT bytepos, int newgap);
static void gap_right (EMACS_INT charpos, EMACS_INT bytepos);
-static void adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to,
- EMACS_INT amount);
-static void adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT to, EMACS_INT to_byte,
- int before_markers);
-static void adjust_markers_for_replace (EMACS_INT, EMACS_INT, EMACS_INT,
- EMACS_INT, EMACS_INT, EMACS_INT);
-static void adjust_point (EMACS_INT nchars, EMACS_INT nbytes);
-Lisp_Object Fcombine_after_change_execute (void);
+static Lisp_Object Fcombine_after_change_execute (void);
/* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
describing changes which happened while combine_after_change_calls
END-UNCHANGED is the number of chars after the changed range,
and CHANGE-AMOUNT is the number of characters inserted by the change
(negative for a deletion). */
-Lisp_Object combine_after_change_list;
+static Lisp_Object combine_after_change_list;
/* Buffer which combine_after_change_list is about. */
-Lisp_Object combine_after_change_buffer;
+static Lisp_Object combine_after_change_buffer;
Lisp_Object Qinhibit_modification_hooks;
+
+static void signal_before_change (EMACS_INT, EMACS_INT, EMACS_INT *);
\f
#define CHECK_MARKERS() \
- if (check_markers_debug_flag) \
- check_markers (); \
- else
+ do \
+ { \
+ if (check_markers_debug_flag) \
+ check_markers (); \
+ } \
+ while (0)
-void
+static void
check_markers (void)
{
register struct Lisp_Marker *tail;
- int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
+ int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
{
memmove (to, from, i);
}
- /* Adjust markers, and buffer data structure, to put the gap at BYTEPOS.
- BYTEPOS is where the loop above stopped, which may be what was specified
- or may be where a quit was detected. */
- adjust_markers_gap_motion (bytepos, GPT_BYTE, GAP_SIZE);
+ /* Adjust buffer data structure, to put the gap at BYTEPOS.
+ BYTEPOS is where the loop above stopped, which may be what
+ was specified or may be where a quit was detected. */
GPT_BYTE = bytepos;
GPT = charpos;
if (bytepos < charpos)
from += i, to += i;
}
- adjust_markers_gap_motion (GPT_BYTE + GAP_SIZE, bytepos + GAP_SIZE,
- - GAP_SIZE);
GPT = charpos;
GPT_BYTE = bytepos;
if (bytepos < charpos)
QUIT;
}
\f
-/* Add AMOUNT to the byte position of every marker in the current buffer
- whose current byte position is between FROM (exclusive) and TO (inclusive).
-
- Also, any markers past the outside of that interval, in the direction
- of adjustment, are first moved back to the near end of the interval
- and then adjusted by AMOUNT.
-
- When the latter adjustment is done, if AMOUNT is negative,
- we record the adjustment for undo. (This case happens only for
- deletion.)
-
- The markers' character positions are not altered,
- because gap motion does not affect character positions. */
-
-int adjust_markers_test;
-
-static void
-adjust_markers_gap_motion (EMACS_INT from, EMACS_INT to, EMACS_INT amount)
-{
- /* Now that a marker has a bytepos, not counting the gap,
- nothing needs to be done here. */
-#if 0
- Lisp_Object marker;
- register struct Lisp_Marker *m;
- register EMACS_INT mpos;
-
- marker = BUF_MARKERS (current_buffer);
-
- while (!NILP (marker))
- {
- m = XMARKER (marker);
- mpos = m->bytepos;
- if (amount > 0)
- {
- if (mpos > to && mpos < to + amount)
- {
- if (adjust_markers_test)
- abort ();
- mpos = to + amount;
- }
- }
- else
- {
- /* Here's the case where a marker is inside text being deleted.
- AMOUNT can be negative for gap motion, too,
- but then this range contains no markers. */
- if (mpos > from + amount && mpos <= from)
- {
- if (adjust_markers_test)
- abort ();
- mpos = from + amount;
- }
- }
- if (mpos > from && mpos <= to)
- mpos += amount;
- m->bufpos = mpos;
- marker = m->chain;
- }
-#endif
-}
-\f
/* Adjust all markers for a deletion
whose range in bytes is FROM_BYTE to TO_BYTE.
The range in charpos is FROM to TO.
- disordered overlays in the slot `overlays_before' of current_buffer. */
if (adjusted)
{
- fix_start_end_in_overlays(from, to);
+ fix_start_end_in_overlays (from, to);
fix_overlays_before (current_buffer, from, to);
}
}
static void
adjust_point (EMACS_INT nchars, EMACS_INT nbytes)
{
- BUF_PT (current_buffer) += nchars;
- BUF_PT_BYTE (current_buffer) += nbytes;
-
+ SET_BUF_PT_BOTH (current_buffer, PT + nchars, PT_BYTE + nbytes);
/* In a single-byte buffer, the two positions must be equal. */
eassert (PT_BYTE >= PT && PT_BYTE - PT <= ZV_BYTE - ZV);
}
}
\f
+void
+buffer_overflow (void)
+{
+ error ("Maximum buffer size exceeded");
+}
+
/* Make the gap NBYTES_ADDED bytes longer. */
-void
+static void
make_gap_larger (EMACS_INT nbytes_added)
{
Lisp_Object tem;
EMACS_INT real_gap_loc;
EMACS_INT real_gap_loc_byte;
EMACS_INT old_gap_size;
+ EMACS_INT current_size = Z_BYTE - BEG_BYTE + GAP_SIZE;
+ enum { enough_for_a_while = 2000 };
- /* If we have to get more space, get enough to last a while. */
- nbytes_added += 2000;
+ if (BUF_BYTES_MAX - current_size < nbytes_added)
+ buffer_overflow ();
- { EMACS_INT total_size = Z_BYTE - BEG_BYTE + GAP_SIZE + nbytes_added;
- if (total_size < 0
- /* Don't allow a buffer size that won't fit in a Lisp integer. */
- || total_size != XINT (make_number (total_size))
- /* Don't allow a buffer size that won't fit in an int
- even if it will fit in a Lisp integer.
- That won't work because so many places still use `int'. */
- || total_size != (EMACS_INT) (int) total_size)
- error ("Buffer exceeds maximum size");
- }
+ /* If we have to get more space, get enough to last a while;
+ but do not exceed the maximum buffer size. */
+ nbytes_added = min (nbytes_added + enough_for_a_while,
+ BUF_BYTES_MAX - current_size);
enlarge_buffer_text (current_buffer, nbytes_added);
Vinhibit_quit = tem;
}
+#if defined USE_MMAP_FOR_BUFFERS || defined REL_ALLOC || defined DOUG_LEA_MALLOC
/* Make the gap NBYTES_REMOVED bytes shorter. */
-void
+static void
make_gap_smaller (EMACS_INT nbytes_removed)
{
Lisp_Object tem;
Vinhibit_quit = tem;
}
+#endif /* USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC */
+
void
make_gap (EMACS_INT nbytes_added)
{
{
EMACS_INT nchars = 0;
EMACS_INT bytes_left = nbytes;
- Lisp_Object tbl = Qnil;
while (bytes_left > 0)
{
return to_addr - initial_to_addr;
}
}
-
-/* Return the number of bytes it would take
- to convert some single-byte text to multibyte.
- The single-byte text consists of NBYTES bytes at PTR. */
-
-EMACS_INT
-count_size_as_multibyte (const unsigned char *ptr, EMACS_INT nbytes)
-{
- EMACS_INT i;
- EMACS_INT outgoing_nbytes = 0;
-
- for (i = 0; i < nbytes; i++)
- {
- unsigned int c = *ptr++;
-
- if (ASCII_CHAR_P (c))
- outgoing_nbytes++;
- else
- {
- c = BYTE8_TO_CHAR (c);
- outgoing_nbytes += CHAR_BYTES (c);
- }
- }
-
- return outgoing_nbytes;
-}
\f
/* Insert a string of specified length before point.
This function judges multibyteness based on
prepare_to_modify_buffer could relocate the text. */
void
-insert (const unsigned char *string, EMACS_INT nbytes)
+insert (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
/* Likewise, but inherit text properties from neighboring characters. */
void
-insert_and_inherit (const unsigned char *string, EMACS_INT nbytes)
+insert_and_inherit (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
unsigned char str[MAX_MULTIBYTE_LENGTH];
int len;
- if (! NILP (current_buffer->enable_multibyte_characters))
+ if (! NILP (BVAR (current_buffer, enable_multibyte_characters)))
len = CHAR_STRING (c, str);
else
{
str[0] = c;
}
- insert (str, len);
+ insert ((char *) str, len);
}
/* Insert the null-terminated string S before point. */
since gc could happen and relocate it. */
void
-insert_before_markers (const unsigned char *string, EMACS_INT nbytes)
+insert_before_markers (const char *string, EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
/* Likewise, but inherit text properties from neighboring characters. */
void
-insert_before_markers_and_inherit (const unsigned char *string,
+insert_before_markers_and_inherit (const char *string,
EMACS_INT nbytes)
{
if (nbytes > 0)
{
- EMACS_INT len = chars_in_text (string, nbytes), opoint;
+ EMACS_INT len = chars_in_text ((unsigned char *) string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
/* Subroutine used by the insert functions above. */
void
-insert_1 (const unsigned char *string, EMACS_INT nbytes,
+insert_1 (const char *string, EMACS_INT nbytes,
int inherit, int prepare, int before_markers)
{
- insert_1_both (string, chars_in_text (string, nbytes), nbytes,
- inherit, prepare, before_markers);
+ insert_1_both (string, chars_in_text ((unsigned char *) string, nbytes),
+ nbytes, inherit, prepare, before_markers);
}
\f
are the same as in insert_1. */
void
-insert_1_both (const unsigned char *string,
+insert_1_both (const char *string,
EMACS_INT nchars, EMACS_INT nbytes,
int inherit, int prepare, int before_markers)
{
if (nchars == 0)
return;
- if (NILP (current_buffer->enable_multibyte_characters))
+ if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
nchars = nbytes;
if (prepare)
/* Make OUTGOING_NBYTES describe the text
as it will be inserted in this buffer. */
- if (NILP (current_buffer->enable_multibyte_characters))
+ if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
outgoing_nbytes = nchars;
else if (! STRING_MULTIBYTE (string))
outgoing_nbytes
between single-byte and multibyte. */
copy_text (SDATA (string) + pos_byte, GPT_ADDR, nbytes,
STRING_MULTIBYTE (string),
- ! NILP (current_buffer->enable_multibyte_characters));
+ ! NILP (BVAR (current_buffer, enable_multibyte_characters)));
#ifdef BYTE_COMBINING_DEBUG
/* We have copied text into the gap, but we have not altered
void
insert_from_gap (EMACS_INT nchars, EMACS_INT nbytes)
{
- if (NILP (current_buffer->enable_multibyte_characters))
+ if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
nchars = nbytes;
record_insert (GPT, nchars);
insert_from_buffer_1 (struct buffer *buf,
EMACS_INT from, EMACS_INT nchars, int inherit)
{
- register Lisp_Object temp;
EMACS_INT chunk, chunk_expanded;
EMACS_INT from_byte = buf_charpos_to_bytepos (buf, from);
EMACS_INT to_byte = buf_charpos_to_bytepos (buf, from + nchars);
/* Make OUTGOING_NBYTES describe the text
as it will be inserted in this buffer. */
- if (NILP (current_buffer->enable_multibyte_characters))
+ if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
outgoing_nbytes = nchars;
- else if (NILP (buf->enable_multibyte_characters))
+ else if (NILP (BVAR (buf, enable_multibyte_characters)))
{
EMACS_INT outgoing_before_gap = 0;
EMACS_INT outgoing_after_gap = 0;
outgoing_nbytes = outgoing_before_gap + outgoing_after_gap;
}
- /* Make sure point-max won't overflow after this insertion. */
- XSETINT (temp, outgoing_nbytes + Z);
- if (outgoing_nbytes + Z != XINT (temp))
- error ("Maximum buffer size exceeded");
-
/* Do this before moving and increasing the gap,
because the before-change hooks might move the gap
or make it smaller. */
chunk_expanded
= copy_text (BUF_BYTE_ADDRESS (buf, from_byte),
GPT_ADDR, chunk,
- ! NILP (buf->enable_multibyte_characters),
- ! NILP (current_buffer->enable_multibyte_characters));
+ ! NILP (BVAR (buf, enable_multibyte_characters)),
+ ! NILP (BVAR (current_buffer, enable_multibyte_characters)));
}
else
chunk_expanded = chunk = 0;
if (chunk < incoming_nbytes)
copy_text (BUF_BYTE_ADDRESS (buf, from_byte + chunk),
GPT_ADDR + chunk_expanded, incoming_nbytes - chunk,
- ! NILP (buf->enable_multibyte_characters),
- ! NILP (current_buffer->enable_multibyte_characters));
+ ! NILP (BVAR (buf, enable_multibyte_characters)),
+ ! NILP (BVAR (current_buffer, enable_multibyte_characters)));
#ifdef BYTE_COMBINING_DEBUG
/* We have copied text into the gap, but we have not altered
PREV_TEXT nil means the new text was just inserted. */
-void
+static void
adjust_after_replace (EMACS_INT from, EMACS_INT from_byte,
Lisp_Object prev_text, EMACS_INT len, EMACS_INT len_byte)
{
adjust_markers_for_insert (from, from_byte,
from + len, from_byte + len_byte, 0);
- if (! EQ (current_buffer->undo_list, Qt))
+ if (! EQ (BVAR (current_buffer, undo_list), Qt))
{
if (nchars_del > 0)
record_delete (from, prev_text);
CHARS_MODIFF = MODIFF;
}
-/* Like adjust_after_replace, but doesn't require PREV_TEXT.
- This is for use when undo is not enabled in the current buffer. */
-
-void
-adjust_after_replace_noundo (EMACS_INT from, EMACS_INT from_byte,
- EMACS_INT nchars_del, EMACS_INT nbytes_del,
- EMACS_INT len, EMACS_INT len_byte)
-{
-#ifdef BYTE_COMBINING_DEBUG
- if (count_combining_before (GPT_ADDR, len_byte, from, from_byte)
- || count_combining_after (GPT_ADDR, len_byte, from, from_byte))
- abort ();
-#endif
-
- /* Update various buffer positions for the new text. */
- GAP_SIZE -= len_byte;
- ZV += len; Z+= len;
- ZV_BYTE += len_byte; Z_BYTE += len_byte;
- GPT += len; GPT_BYTE += len_byte;
- if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */
-
- if (nchars_del > 0)
- adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
- len, len_byte);
- else
- adjust_markers_for_insert (from, from_byte,
- from + len, from_byte + len_byte, 0);
-
- if (len > nchars_del)
- adjust_overlays_for_insert (from, len - nchars_del);
- else if (len < nchars_del)
- adjust_overlays_for_delete (from, nchars_del - len);
- if (BUF_INTERVALS (current_buffer) != 0)
- {
- offset_intervals (current_buffer, from, len - nchars_del);
- }
-
- if (from < PT)
- adjust_point (len - nchars_del, len_byte - nbytes_del);
-
- /* As byte combining will decrease Z, we must check this again. */
- if (Z - GPT < END_UNCHANGED)
- END_UNCHANGED = Z - GPT;
-
- CHECK_MARKERS ();
-
- if (len == 0)
- evaporate_overlays (from);
- MODIFF++;
- CHARS_MODIFF = MODIFF;
-}
-
/* Record undo information, adjust markers and position keepers for an
insertion of a text from FROM (FROM_BYTE) to TO (TO_BYTE). The
text already exists in the current buffer but character length (TO
EMACS_INT insbytes = SBYTES (new);
EMACS_INT from_byte, to_byte;
EMACS_INT nbytes_del, nchars_del;
- register Lisp_Object temp;
struct gcpro gcpro1;
INTERVAL intervals;
EMACS_INT outgoing_insbytes = insbytes;
UNGCPRO;
- /* Make args be valid */
+ /* Make args be valid. */
if (from < BEGV)
from = BEGV;
if (to > ZV)
/* Make OUTGOING_INSBYTES describe the text
as it will be inserted in this buffer. */
- if (NILP (current_buffer->enable_multibyte_characters))
+ if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
outgoing_insbytes = inschars;
else if (! STRING_MULTIBYTE (new))
outgoing_insbytes
= count_size_as_multibyte (SDATA (new), insbytes);
- /* Make sure point-max won't overflow after this insertion. */
- XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
- if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
- error ("Maximum buffer size exceeded");
-
GCPRO1 (new);
/* Make sure the gap is somewhere in or next to what we are deleting. */
/* Even if we don't record for undo, we must keep the original text
because we may have to recover it because of inappropriate byte
combining. */
- if (! EQ (current_buffer->undo_list, Qt))
+ if (! EQ (BVAR (current_buffer, undo_list), Qt))
deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
GAP_SIZE += nbytes_del;
if (Z - GPT < END_UNCHANGED)
END_UNCHANGED = Z - GPT;
- if (GAP_SIZE < insbytes)
- make_gap (insbytes - GAP_SIZE);
+ if (GAP_SIZE < outgoing_insbytes)
+ make_gap (outgoing_insbytes - GAP_SIZE);
/* Copy the string text into the buffer, perhaps converting
between single-byte and multibyte. */
copy_text (SDATA (new), GPT_ADDR, insbytes,
STRING_MULTIBYTE (new),
- ! NILP (current_buffer->enable_multibyte_characters));
+ ! NILP (BVAR (current_buffer, enable_multibyte_characters)));
#ifdef BYTE_COMBINING_DEBUG
/* We have copied text into the gap, but we have not marked
abort ();
#endif
- if (! EQ (current_buffer->undo_list, Qt))
+ if (! EQ (BVAR (current_buffer, undo_list), Qt))
{
/* Record the insertion first, so that when we undo,
the deletion will be undone first. Thus, undo
int markers)
{
EMACS_INT nbytes_del, nchars_del;
- Lisp_Object temp;
CHECK_MARKERS ();
if (nbytes_del <= 0 && insbytes == 0)
return;
- /* Make sure point-max won't overflow after this insertion. */
- XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
- if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
- error ("Maximum buffer size exceeded");
-
/* Make sure the gap is somewhere in or next to what we are deleting. */
if (from > GPT)
gap_right (from, from_byte);
to_byte = CHAR_TO_BYTE (to);
deletion = del_range_2 (from, from_byte, to, to_byte, ret_string);
- GCPRO1(deletion);
+ GCPRO1 (deletion);
signal_after_change (from, to - from, 0);
update_compositions (from, from, CHECK_HEAD);
UNGCPRO;
abort ();
#endif
- if (ret_string || ! EQ (current_buffer->undo_list, Qt))
+ if (ret_string || ! EQ (BVAR (current_buffer, undo_list), Qt))
deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
else
deletion = Qnil;
so that undo handles this after reinserting the text. */
adjust_markers_for_delete (from, from_byte, to, to_byte);
- if (! EQ (current_buffer->undo_list, Qt))
+ if (! EQ (BVAR (current_buffer, undo_list), Qt))
record_delete (from, deletion);
MODIFF++;
CHARS_MODIFF = MODIFF;
if (! preserve_chars_modiff)
CHARS_MODIFF = MODIFF;
- buffer->point_before_scroll = Qnil;
+ BVAR (buffer, point_before_scroll) = Qnil;
if (buffer != old_buffer)
set_buffer_internal (old_buffer);
{
struct buffer *base_buffer;
- if (!NILP (current_buffer->read_only))
+ if (!NILP (BVAR (current_buffer, read_only)))
Fbarf_if_buffer_read_only ();
/* Let redisplay consider other windows than selected_window
base_buffer = current_buffer;
#ifdef CLASH_DETECTION
- if (!NILP (base_buffer->file_truename)
+ if (!NILP (BVAR (base_buffer, file_truename))
/* Make binding buffer-file-name to nil effective. */
- && !NILP (base_buffer->filename)
+ && !NILP (BVAR (base_buffer, filename))
&& SAVE_MODIFF >= MODIFF)
- lock_file (base_buffer->file_truename);
+ lock_file (BVAR (base_buffer, file_truename));
#else
/* At least warn if this file has changed on disk since it was visited. */
- if (!NILP (base_buffer->filename)
+ if (!NILP (BVAR (base_buffer, filename))
&& SAVE_MODIFF >= MODIFF
&& NILP (Fverify_visited_file_modtime (Fcurrent_buffer ()))
- && !NILP (Ffile_exists_p (base_buffer->filename)))
+ && !NILP (Ffile_exists_p (BVAR (base_buffer, filename))))
call1 (intern ("ask-user-about-supersession-threat"),
- base_buffer->filename);
+ BVAR (base_buffer,filename));
#endif /* not CLASH_DETECTION */
/* If `select-active-regions' is non-nil, save the region text. */
- if (!NILP (current_buffer->mark_active)
+ if (!NILP (BVAR (current_buffer, mark_active))
&& !inhibit_modification_hooks
- && XMARKER (current_buffer->mark)->buffer
+ && XMARKER (BVAR (current_buffer, mark))->buffer
&& NILP (Vsaved_region_selection)
&& (EQ (Vselect_active_regions, Qonly)
? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly)
: (!NILP (Vselect_active_regions)
&& !NILP (Vtransient_mark_mode))))
{
- EMACS_INT b = XMARKER (current_buffer->mark)->charpos;
+ EMACS_INT b = XMARKER (BVAR (current_buffer, mark))->charpos;
EMACS_INT e = PT;
if (b < e)
Vsaved_region_selection = make_buffer_string (b, e, 0);
VARIABLE is the variable to maybe set to nil.
NO-ERROR-FLAG is nil if there was an error,
anything else meaning no error (so this function does nothing). */
-Lisp_Object
+static Lisp_Object
reset_var_on_error (Lisp_Object val)
{
if (NILP (XCDR (val)))
If PRESERVE_PTR is nonzero, we relocate *PRESERVE_PTR
by holding its value temporarily in a marker. */
-void
+static void
signal_before_change (EMACS_INT start_int, EMACS_INT end_int,
EMACS_INT *preserve_ptr)
{
specbind (Qinhibit_modification_hooks, Qt);
- /* If buffer is unmodified, run a special hook for that case. */
+ /* If buffer is unmodified, run a special hook for that case. The
+ check for Vfirst_change_hook is just a minor optimization. */
if (SAVE_MODIFF >= MODIFF
- && !NILP (Vfirst_change_hook)
- && !NILP (Vrun_hooks))
+ && !NILP (Vfirst_change_hook))
{
PRESERVE_VALUE;
PRESERVE_START_END;
- call1 (Vrun_hooks, Qfirst_change_hook);
+ Frun_hooks (1, &Qfirst_change_hook);
}
/* Now run the before-change-functions if any. */
unbind_to (count, Qnil);
}
-Lisp_Object
+static Lisp_Object
Fcombine_after_change_execute_1 (Lisp_Object val)
{
Vcombine_after_change_calls = val;
non-nil, and insertion calls a file handler (e.g. through
lock_file) which scribbles into a temp file -- cyd */
if (!BUFFERP (combine_after_change_buffer)
- || NILP (XBUFFER (combine_after_change_buffer)->name))
+ || NILP (BVAR (XBUFFER (combine_after_change_buffer), name)))
{
combine_after_change_list = Qnil;
return Qnil;
This affects `before-change-functions' and `after-change-functions',
as well as hooks attached to text properties and overlays. */);
inhibit_modification_hooks = 0;
- Qinhibit_modification_hooks = intern_c_string ("inhibit-modification-hooks");
- staticpro (&Qinhibit_modification_hooks);
+ DEFSYM (Qinhibit_modification_hooks, "inhibit-modification-hooks");
defsubr (&Scombine_after_change_execute);
}
-
HCoop / bpt / emacs.git / blobdiff