BUF_CHARS_MODIFF (b) = 1;
BUF_OVERLAY_MODIFF (b) = 1;
BUF_SAVE_MODIFF (b) = 1;
- buffer_set_intervals (b, NULL);
+ set_buffer_intervals (b, NULL);
BUF_UNCHANGED_MODIFIED (b) = 1;
BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1;
BUF_END_UNCHANGED (b) = 0;
BSET (b, zv_marker, Qnil);
name = Fcopy_sequence (buffer_or_name);
- string_set_intervals (name, NULL);
+ set_string_intervals (name, NULL);
BSET (b, name, name);
BSET (b, undo_list, (SREF (name, 0) != ' ') ? Qnil : Qt);
return result;
}
+/* Set an appropriate overlay of B. */
+
+static inline void
+set_buffer_overlays_before (struct buffer *b, struct Lisp_Overlay *o)
+{
+ b->overlays_before = o;
+}
+
+static inline void
+set_buffer_overlays_after (struct buffer *b, struct Lisp_Overlay *o)
+{
+ b->overlays_after = o;
+}
/* Clone per-buffer values of buffer FROM.
memcpy (to->local_flags, from->local_flags, sizeof to->local_flags);
- buffer_set_overlays_before (to, copy_overlays (to, from->overlays_before));
- buffer_set_overlays_after (to, copy_overlays (to, from->overlays_after));
+ set_buffer_overlays_before (to, copy_overlays (to, from->overlays_before));
+ set_buffer_overlays_after (to, copy_overlays (to, from->overlays_after));
/* Get (a copy of) the alist of Lisp-level local variables of FROM
and install that in TO. */
all_buffers = b;
name = Fcopy_sequence (name);
- string_set_intervals (name, NULL);
+ set_string_intervals (name, NULL);
BSET (b, name, name);
reset_buffer (b);
ov->next = NULL;
}
- buffer_set_overlays_before (b, NULL);
- buffer_set_overlays_after (b, NULL);
+ set_buffer_overlays_before (b, NULL);
+ set_buffer_overlays_after (b, NULL);
}
/* Reinitialize everything about a buffer except its name and contents
b->auto_save_failure_time = 0;
BSET (b, auto_save_file_name, Qnil);
BSET (b, read_only, Qnil);
- buffer_set_overlays_before (b, NULL);
- buffer_set_overlays_after (b, NULL);
+ set_buffer_overlays_before (b, NULL);
+ set_buffer_overlays_after (b, NULL);
b->overlay_center = BEG;
BSET (b, mark_active, Qnil);
BSET (b, point_before_scroll, Qnil);
m = next;
}
BUF_MARKERS (b) = NULL;
- buffer_set_intervals (b, NULL);
+ set_buffer_intervals (b, NULL);
/* Perhaps we should explicitly free the interval tree here... */
}
if (prev)
prev->next = next;
else
- buffer_set_overlays_before (buf, next);
+ set_buffer_overlays_before (buf, next);
/* Search thru overlays_after for where to put it. */
other_prev = NULL;
if (other_prev)
other_prev->next = tail;
else
- buffer_set_overlays_after (buf, tail);
+ set_buffer_overlays_after (buf, tail);
tail = prev;
}
else
if (prev)
prev->next = next;
else
- buffer_set_overlays_after (buf, next);
+ set_buffer_overlays_after (buf, next);
/* Search thru overlays_before for where to put it. */
other_prev = NULL;
if (other_prev)
other_prev->next = tail;
else
- buffer_set_overlays_before (buf, tail);
+ set_buffer_overlays_before (buf, tail);
tail = prev;
}
}
beforep = tail;
}
if (!parent)
- buffer_set_overlays_before (current_buffer, tail->next);
+ set_buffer_overlays_before (current_buffer, tail->next);
else
parent->next = tail->next;
tail = tail->next;
beforep = tail;
}
if (!parent)
- buffer_set_overlays_after (current_buffer, tail->next);
+ set_buffer_overlays_after (current_buffer, tail->next);
else
parent->next = tail->next;
tail = tail->next;
if (beforep)
{
beforep->next = current_buffer->overlays_before;
- buffer_set_overlays_before (current_buffer, before_list);
+ set_buffer_overlays_before (current_buffer, before_list);
}
recenter_overlay_lists (current_buffer, current_buffer->overlay_center);
if (afterp)
{
afterp->next = current_buffer->overlays_after;
- buffer_set_overlays_after (current_buffer, after_list);
+ set_buffer_overlays_after (current_buffer, after_list);
}
recenter_overlay_lists (current_buffer, current_buffer->overlay_center);
}
if (!right_pair)
{
found->next = bp->overlays_before;
- buffer_set_overlays_before (bp, found);
+ set_buffer_overlays_before (bp, found);
}
else
{
{
if (b->overlays_after)
XOVERLAY (overlay)->next = b->overlays_after;
- buffer_set_overlays_after (b, XOVERLAY (overlay));
+ set_buffer_overlays_after (b, XOVERLAY (overlay));
}
else
{
if (b->overlays_before)
XOVERLAY (overlay)->next = b->overlays_before;
- buffer_set_overlays_before (b, XOVERLAY (overlay));
+ set_buffer_overlays_before (b, XOVERLAY (overlay));
}
/* This puts it in the right list, and in the right order. */
{
struct Lisp_Overlay *ov = XOVERLAY (overlay);
- buffer_set_overlays_before (b, unchain_overlay (b->overlays_before, ov));
- buffer_set_overlays_after (b, unchain_overlay (b->overlays_after, ov));
+ set_buffer_overlays_before (b, unchain_overlay (b->overlays_before, ov));
+ set_buffer_overlays_after (b, unchain_overlay (b->overlays_after, ov));
eassert (XOVERLAY (overlay)->next == NULL);
}
if (n_end < b->overlay_center)
{
XOVERLAY (overlay)->next = b->overlays_after;
- buffer_set_overlays_after (b, XOVERLAY (overlay));
+ set_buffer_overlays_after (b, XOVERLAY (overlay));
}
else
{
XOVERLAY (overlay)->next = b->overlays_before;
- buffer_set_overlays_before (b, XOVERLAY (overlay));
+ set_buffer_overlays_before (b, XOVERLAY (overlay));
}
/* This puts it in the right list, and in the right order. */
/* No one will share the text with these buffers, but let's play it safe. */
buffer_defaults.indirections = 0;
buffer_local_symbols.indirections = 0;
- buffer_set_intervals (&buffer_defaults, NULL);
- buffer_set_intervals (&buffer_local_symbols, NULL);
+ set_buffer_intervals (&buffer_defaults, NULL);
+ set_buffer_intervals (&buffer_local_symbols, NULL);
XSETPVECTYPESIZE (&buffer_defaults, PVEC_BUFFER, pvecsize);
XSETBUFFER (Vbuffer_defaults, &buffer_defaults);
XSETPVECTYPESIZE (&buffer_local_symbols, PVEC_BUFFER, pvecsize);
BSET (&buffer_defaults, mark_active, Qnil);
BSET (&buffer_defaults, file_format, Qnil);
BSET (&buffer_defaults, auto_save_file_format, Qt);
- buffer_set_overlays_before (&buffer_defaults, NULL);
- buffer_set_overlays_after (&buffer_defaults, NULL);
+ set_buffer_overlays_before (&buffer_defaults, NULL);
+ set_buffer_overlays_after (&buffer_defaults, NULL);
buffer_defaults.overlay_center = BEG;
XSETFASTINT (BVAR (&buffer_defaults, tab_width), 8);