/* Interface code for dealing with text properties.
- Copyright (C) 1993 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
This file is part of GNU Emacs.
along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include "config.h"
+#include <config.h>
#include "lisp.h"
#include "intervals.h"
#include "buffer.h"
+#include "window.h"
+
+#ifndef NULL
+#define NULL (void *)0
+#endif
\f
/* NOTES: previous- and next- property change will have to skip
Lisp_Object Qmouse_entered;
Lisp_Object Qpoint_left;
Lisp_Object Qpoint_entered;
-Lisp_Object Qmodification_hooks;
Lisp_Object Qcategory;
Lisp_Object Qlocal_map;
/* Visual properties text (including strings) may have. */
Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple;
-Lisp_Object Qinvisible, Qread_only;
+Lisp_Object Qinvisible, Qread_only, Qintangible;
+
+/* Sticky properties */
+Lisp_Object Qfront_sticky, Qrear_nonsticky;
+
+/* If o1 is a cons whose cdr is a cons, return non-zero and set o2 to
+ the o1's cdr. Otherwise, return zero. This is handy for
+ traversing plists. */
+#define PLIST_ELT_P(o1, o2) (CONSP (o1) && ((o2)=XCONS (o1)->cdr, CONSP (o2)))
+
+Lisp_Object Vinhibit_point_motion_hooks;
+Lisp_Object Vdefault_properties;
+
\f
/* Extract the interval at the position pointed to by BEGIN from
OBJECT, a string or buffer. Additionally, check that the positions
/* If we are asked for a point, but from a subr which operates
on a range, then return nothing. */
- if (*begin == *end && begin != end)
+ if (EQ (*begin, *end) && begin != end)
return NULL_INTERVAL;
if (XINT (*begin) > XINT (*end))
*end = n;
}
- if (XTYPE (object) == Lisp_Buffer)
+ if (BUFFERP (object))
{
register struct buffer *b = XBUFFER (object);
if (!(BUF_BEGV (b) <= XINT (*begin) && XINT (*begin) <= XINT (*end)
&& XINT (*end) <= BUF_ZV (b)))
args_out_of_range (*begin, *end);
- i = b->intervals;
+ i = BUF_INTERVALS (b);
/* If there's no text, there are no properties. */
if (BUF_BEGV (b) == BUF_ZV (b))
return NULL_INTERVAL;
searchpos = XINT (*begin);
- if (searchpos == BUF_Z (b))
- searchpos--;
-#if 0
- /* Special case for point-max: return the interval for the
- last character. */
- if (*begin == *end && *begin == BUF_Z (b))
- *begin -= 1;
-#endif
}
else
{
args_out_of_range (*begin, *end);
/* User-level Positions in strings start with 0,
but the interval code always wants positions starting with 1. */
- XFASTINT (*begin) += 1;
- XFASTINT (*end) += 1;
+ XSETFASTINT (*begin, XFASTINT (*begin) + 1);
+ if (begin != end)
+ XSETFASTINT (*end, XFASTINT (*end) + 1);
i = s->intervals;
if (s->size == 0)
return NULL_INTERVAL;
searchpos = XINT (*begin);
- if (searchpos > s->size)
- searchpos--;
}
if (NULL_INTERVAL_P (i))
static Lisp_Object
validate_plist (list)
+ Lisp_Object list;
{
if (NILP (list))
return Qnil;
register int i;
register Lisp_Object tail;
for (i = 0, tail = list; !NILP (tail); i++)
- tail = Fcdr (tail);
+ {
+ tail = Fcdr (tail);
+ QUIT;
+ }
if (i & 1)
error ("Odd length text property list");
return list;
{
/* Found the same property on both lists. If the
values are unequal, return zero. */
- if (! EQ (Fequal (Fcar (Fcdr (tail1)), Fcar (Fcdr (tail2))),
- Qt))
+ if (! EQ (Fcar (Fcdr (tail1)), Fcar (Fcdr (tail2))))
return 0;
/* Property has same value on both lists; go to next one. */
return 0;
}
\f
+/* Changing the plists of individual intervals. */
+
+/* Return the value of PROP in property-list PLIST, or Qunbound if it
+ has none. */
+static Lisp_Object
+property_value (plist, prop)
+ Lisp_Object plist, prop;
+{
+ Lisp_Object value;
+
+ while (PLIST_ELT_P (plist, value))
+ if (EQ (XCONS (plist)->car, prop))
+ return XCONS (value)->car;
+ else
+ plist = XCONS (value)->cdr;
+
+ return Qunbound;
+}
+
/* Set the properties of INTERVAL to PROPERTIES,
and record undo info for the previous values.
OBJECT is the string or buffer that INTERVAL belongs to. */
Lisp_Object properties, object;
INTERVAL interval;
{
- Lisp_Object oldprops;
- oldprops = interval->plist;
+ Lisp_Object sym, value;
- /* Record undo for old properties. */
- while (XTYPE (oldprops) == Lisp_Cons)
+ if (BUFFERP (object))
{
- Lisp_Object sym;
- sym = Fcar (oldprops);
- record_property_change (interval->position, LENGTH (interval),
- sym, Fcar_safe (Fcdr (oldprops)),
- object);
-
- oldprops = Fcdr_safe (Fcdr (oldprops));
+ /* For each property in the old plist which is missing from PROPERTIES,
+ or has a different value in PROPERTIES, make an undo record. */
+ for (sym = interval->plist;
+ PLIST_ELT_P (sym, value);
+ sym = XCONS (value)->cdr)
+ if (! EQ (property_value (properties, XCONS (sym)->car),
+ XCONS (value)->car))
+ {
+ modify_region (XBUFFER (object),
+ make_number (interval->position),
+ make_number (interval->position + LENGTH (interval)));
+ record_property_change (interval->position, LENGTH (interval),
+ XCONS (sym)->car, XCONS (value)->car,
+ object);
+ }
+
+ /* For each new property that has no value at all in the old plist,
+ make an undo record binding it to nil, so it will be removed. */
+ for (sym = properties;
+ PLIST_ELT_P (sym, value);
+ sym = XCONS (value)->cdr)
+ if (EQ (property_value (interval->plist, XCONS (sym)->car), Qunbound))
+ {
+ modify_region (XBUFFER (object),
+ make_number (interval->position),
+ make_number (interval->position + LENGTH (interval)));
+ record_property_change (interval->position, LENGTH (interval),
+ XCONS (sym)->car, Qnil,
+ object);
+ }
}
/* Store new properties. */
INTERVAL i;
Lisp_Object object;
{
- register Lisp_Object tail1, tail2, sym1, val1;
+ Lisp_Object tail1, tail2, sym1, val1;
register int changed = 0;
register int found;
+ struct gcpro gcpro1, gcpro2, gcpro3;
+
+ tail1 = plist;
+ sym1 = Qnil;
+ val1 = Qnil;
+ /* No need to protect OBJECT, because we can GC only in the case
+ where it is a buffer, and live buffers are always protected.
+ I and its plist are also protected, via OBJECT. */
+ GCPRO3 (tail1, sym1, val1);
/* Go through each element of PLIST. */
for (tail1 = plist; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1)))
for (tail2 = i->plist; ! NILP (tail2); tail2 = Fcdr (Fcdr (tail2)))
if (EQ (sym1, Fcar (tail2)))
{
- register Lisp_Object this_cdr = Fcdr (tail2);
+ /* No need to gcpro, because tail2 protects this
+ and it must be a cons cell (we get an error otherwise). */
+ register Lisp_Object this_cdr;
+ this_cdr = Fcdr (tail2);
/* Found the property. Now check its value. */
found = 1;
/* The properties have the same value on both lists.
Continue to the next property. */
- if (!NILP (Fequal (val1, Fcar (this_cdr))))
+ if (EQ (val1, Fcar (this_cdr)))
break;
/* Record this change in the buffer, for undo purposes. */
- if (XTYPE (object) == Lisp_Buffer)
+ if (BUFFERP (object))
{
- record_property_change (i->position, LENGTH (i),
- sym1, Fcar (this_cdr), object);
modify_region (XBUFFER (object),
make_number (i->position),
make_number (i->position + LENGTH (i)));
+ record_property_change (i->position, LENGTH (i),
+ sym1, Fcar (this_cdr), object);
}
/* I's property has a different value -- change it */
if (! found)
{
/* Record this change in the buffer, for undo purposes. */
- if (XTYPE (object) == Lisp_Buffer)
+ if (BUFFERP (object))
{
- record_property_change (i->position, LENGTH (i),
- sym1, Qnil, object);
modify_region (XBUFFER (object),
make_number (i->position),
make_number (i->position + LENGTH (i)));
+ record_property_change (i->position, LENGTH (i),
+ sym1, Qnil, object);
}
i->plist = Fcons (sym1, Fcons (val1, i->plist));
changed++;
}
}
+ UNGCPRO;
+
return changed;
}
INTERVAL i;
Lisp_Object object;
{
- register Lisp_Object tail1, tail2, sym;
- register Lisp_Object current_plist = i->plist;
+ register Lisp_Object tail1, tail2, sym, current_plist;
register int changed = 0;
+ current_plist = i->plist;
/* Go through each element of plist. */
for (tail1 = plist; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1)))
{
/* First, remove the symbol if its at the head of the list */
while (! NILP (current_plist) && EQ (sym, Fcar (current_plist)))
{
- if (XTYPE (object) == Lisp_Buffer)
+ if (BUFFERP (object))
{
- record_property_change (i->position, LENGTH (i),
- sym, Fcar (Fcdr (current_plist)),
- object);
modify_region (XBUFFER (object),
make_number (i->position),
make_number (i->position + LENGTH (i)));
+ record_property_change (i->position, LENGTH (i),
+ sym, Fcar (Fcdr (current_plist)),
+ object);
}
current_plist = Fcdr (Fcdr (current_plist));
tail2 = current_plist;
while (! NILP (tail2))
{
- register Lisp_Object this = Fcdr (Fcdr (tail2));
+ register Lisp_Object this;
+ this = Fcdr (Fcdr (tail2));
if (EQ (sym, Fcar (this)))
{
- if (XTYPE (object) == Lisp_Buffer)
+ if (BUFFERP (object))
{
- record_property_change (i->position, LENGTH (i),
- sym, Fcar (Fcdr (this)), object);
modify_region (XBUFFER (object),
make_number (i->position),
make_number (i->position + LENGTH (i)));
+ record_property_change (i->position, LENGTH (i),
+ sym, Fcar (Fcdr (this)), object);
}
Fsetcdr (Fcdr (tail2), Fcdr (Fcdr (this)));
register INTERVAL i;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
i = validate_interval_range (object, &pos, &pos, soft);
if (NULL_INTERVAL_P (i))
"Return the value of position POS's property PROP, in OBJECT.\n\
OBJECT is optional and defaults to the current buffer.\n\
If POSITION is at the end of OBJECT, the value is nil.")
+ (pos, prop, object)
+ Lisp_Object pos, object;
+ Lisp_Object prop;
+{
+ return textget (Ftext_properties_at (pos, object), prop);
+}
+
+DEFUN ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0,
+ "Return the value of position POS's property PROP, in OBJECT.\n\
+OBJECT is optional and defaults to the current buffer.\n\
+If POS is at the end of OBJECT, the value is nil.\n\
+If OBJECT is a buffer, then overlay properties are considered as well as\n\
+text properties.\n\
+If OBJECT is a window, then that window's buffer is used, but window-specific\n\
+overlays are considered only if they are associated with OBJECT.")
(pos, prop, object)
Lisp_Object pos, object;
register Lisp_Object prop;
{
- register INTERVAL i;
- register Lisp_Object tail;
+ struct window *w = 0;
+
+ CHECK_NUMBER_COERCE_MARKER (pos, 0);
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
- i = validate_interval_range (object, &pos, &pos, soft);
- if (NULL_INTERVAL_P (i))
- return Qnil;
+ XSETBUFFER (object, current_buffer);
- /* If POS is at the end of the interval,
- it means it's the end of OBJECT.
- There are no properties at the very end,
- since no character follows. */
- if (XINT (pos) == LENGTH (i) + i->position)
- return Qnil;
+ if (WINDOWP (object))
+ {
+ w = XWINDOW (object);
+ object = w->buffer;
+ }
+ if (BUFFERP (object))
+ {
+ int posn = XINT (pos);
+ int noverlays;
+ Lisp_Object *overlay_vec, tem;
+ int next_overlay;
+ int len;
+
+ /* First try with room for 40 overlays. */
+ len = 40;
+ overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+
+ noverlays = overlays_at (posn, 0, &overlay_vec, &len,
+ &next_overlay, NULL);
+
+ /* If there are more than 40,
+ make enough space for all, and try again. */
+ if (noverlays > len)
+ {
+ len = noverlays;
+ overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+ noverlays = overlays_at (posn, 0, &overlay_vec, &len,
+ &next_overlay, NULL);
+ }
+ noverlays = sort_overlays (overlay_vec, noverlays, w);
- return textget (i->plist, prop);
+ /* Now check the overlays in order of decreasing priority. */
+ while (--noverlays >= 0)
+ {
+ tem = Foverlay_get (overlay_vec[noverlays], prop);
+ if (!NILP (tem))
+ return (tem);
+ }
+ }
+ /* Not a buffer, or no appropriate overlay, so fall through to the
+ simpler case. */
+ return (Fget_text_property (pos, prop, object));
}
DEFUN ("next-property-change", Fnext_property_change,
- Snext_property_change, 1, 2, 0,
+ Snext_property_change, 1, 3, 0,
"Return the position of next property change.\n\
Scans characters forward from POS in OBJECT till it finds\n\
a change in some text property, then returns the position of the change.\n\
The optional second argument OBJECT is the string or buffer to scan.\n\
Return nil if the property is constant all the way to the end of OBJECT.\n\
-If the value is non-nil, it is a position greater than POS, never equal.")
- (pos, object)
- Lisp_Object pos, object;
+If the value is non-nil, it is a position greater than POS, never equal.\n\n\
+If the optional third argument LIMIT is non-nil, don't search\n\
+past position LIMIT; return LIMIT if nothing is found before LIMIT.")
+ (pos, object, limit)
+ Lisp_Object pos, object, limit;
{
register INTERVAL i, next;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
+
+ if (! NILP (limit) && ! EQ (limit, Qt))
+ CHECK_NUMBER_COERCE_MARKER (limit, 0);
i = validate_interval_range (object, &pos, &pos, soft);
if (NULL_INTERVAL_P (i))
- return Qnil;
+ return limit;
next = next_interval (i);
- while (! NULL_INTERVAL_P (next) && intervals_equal (i, next))
+ /* If LIMIT is t, return start of next interval--don't
+ bother checking further intervals. */
+ if (EQ (limit, Qt))
+ {
+ XSETFASTINT (pos, next->position - (STRINGP (object)));
+ return pos;
+ }
+
+ while (! NULL_INTERVAL_P (next) && intervals_equal (i, next)
+ && (NILP (limit) || next->position < XFASTINT (limit)))
next = next_interval (next);
if (NULL_INTERVAL_P (next))
- return Qnil;
+ return limit;
+ if (! NILP (limit) && !(next->position < XFASTINT (limit)))
+ return limit;
- return next->position - (XTYPE (object) == Lisp_String);
-;
+ XSETFASTINT (pos, next->position - (STRINGP (object)));
+ return pos;
+}
+
+/* Return 1 if there's a change in some property between BEG and END. */
+
+int
+property_change_between_p (beg, end)
+ int beg, end;
+{
+ register INTERVAL i, next;
+ Lisp_Object object, pos;
+
+ XSETBUFFER (object, current_buffer);
+ XSETFASTINT (pos, beg);
+
+ i = validate_interval_range (object, &pos, &pos, soft);
+ if (NULL_INTERVAL_P (i))
+ return 0;
+
+ next = next_interval (i);
+ while (! NULL_INTERVAL_P (next) && intervals_equal (i, next))
+ {
+ next = next_interval (next);
+ if (NULL_INTERVAL_P (next))
+ return 0;
+ if (next->position >= end)
+ return 0;
+ }
+
+ if (NULL_INTERVAL_P (next))
+ return 0;
+
+ return 1;
}
DEFUN ("next-single-property-change", Fnext_single_property_change,
- Snext_single_property_change, 1, 3, 0,
+ Snext_single_property_change, 2, 4, 0,
"Return the position of next property change for a specific property.\n\
Scans characters forward from POS till it finds\n\
a change in the PROP property, then returns the position of the change.\n\
The optional third argument OBJECT is the string or buffer to scan.\n\
+The property values are compared with `eq'.\n\
Return nil if the property is constant all the way to the end of OBJECT.\n\
-If the value is non-nil, it is a position greater than POS, never equal.")
- (pos, prop, object)
- Lisp_Object pos, prop, object;
+If the value is non-nil, it is a position greater than POS, never equal.\n\n\
+If the optional fourth argument LIMIT is non-nil, don't search\n\
+past position LIMIT; return LIMIT if nothing is found before LIMIT.")
+ (pos, prop, object, limit)
+ Lisp_Object pos, prop, object, limit;
{
register INTERVAL i, next;
register Lisp_Object here_val;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
+
+ if (!NILP (limit))
+ CHECK_NUMBER_COERCE_MARKER (limit, 0);
i = validate_interval_range (object, &pos, &pos, soft);
if (NULL_INTERVAL_P (i))
- return Qnil;
+ return limit;
here_val = textget (i->plist, prop);
next = next_interval (i);
while (! NULL_INTERVAL_P (next)
- && EQ (here_val, textget (next->plist, prop)))
+ && EQ (here_val, textget (next->plist, prop))
+ && (NILP (limit) || next->position < XFASTINT (limit)))
next = next_interval (next);
if (NULL_INTERVAL_P (next))
- return Qnil;
+ return limit;
+ if (! NILP (limit) && !(next->position < XFASTINT (limit)))
+ return limit;
- return next->position - (XTYPE (object) == Lisp_String);
+ XSETFASTINT (pos, next->position - (STRINGP (object)));
+ return pos;
}
DEFUN ("previous-property-change", Fprevious_property_change,
- Sprevious_property_change, 1, 2, 0,
+ Sprevious_property_change, 1, 3, 0,
"Return the position of previous property change.\n\
Scans characters backwards from POS in OBJECT till it finds\n\
a change in some text property, then returns the position of the change.\n\
The optional second argument OBJECT is the string or buffer to scan.\n\
Return nil if the property is constant all the way to the start of OBJECT.\n\
-If the value is non-nil, it is a position less than POS, never equal.")
- (pos, object)
- Lisp_Object pos, object;
+If the value is non-nil, it is a position less than POS, never equal.\n\n\
+If the optional third argument LIMIT is non-nil, don't search\n\
+back past position LIMIT; return LIMIT if nothing is found until LIMIT.")
+ (pos, object, limit)
+ Lisp_Object pos, object, limit;
{
register INTERVAL i, previous;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
+
+ if (!NILP (limit))
+ CHECK_NUMBER_COERCE_MARKER (limit, 0);
i = validate_interval_range (object, &pos, &pos, soft);
if (NULL_INTERVAL_P (i))
- return Qnil;
+ return limit;
+
+ /* Start with the interval containing the char before point. */
+ if (i->position == XFASTINT (pos))
+ i = previous_interval (i);
previous = previous_interval (i);
- while (! NULL_INTERVAL_P (previous) && intervals_equal (previous, i))
+ while (! NULL_INTERVAL_P (previous) && intervals_equal (previous, i)
+ && (NILP (limit)
+ || previous->position + LENGTH (previous) > XFASTINT (limit)))
previous = previous_interval (previous);
if (NULL_INTERVAL_P (previous))
- return Qnil;
-
- return (previous->position + LENGTH (previous) - 1
- - (XTYPE (object) == Lisp_String));
+ return limit;
+ if (!NILP (limit)
+ && !(previous->position + LENGTH (previous) > XFASTINT (limit)))
+ return limit;
+
+ XSETFASTINT (pos, (previous->position + LENGTH (previous)
+ - (STRINGP (object))));
+ return pos;
}
DEFUN ("previous-single-property-change", Fprevious_single_property_change,
- Sprevious_single_property_change, 2, 3, 0,
+ Sprevious_single_property_change, 2, 4, 0,
"Return the position of previous property change for a specific property.\n\
Scans characters backward from POS till it finds\n\
a change in the PROP property, then returns the position of the change.\n\
The optional third argument OBJECT is the string or buffer to scan.\n\
+The property values are compared with `eq'.\n\
Return nil if the property is constant all the way to the start of OBJECT.\n\
-If the value is non-nil, it is a position less than POS, never equal.")
- (pos, prop, object)
- Lisp_Object pos, prop, object;
+If the value is non-nil, it is a position less than POS, never equal.\n\n\
+If the optional fourth argument LIMIT is non-nil, don't search\n\
+back past position LIMIT; return LIMIT if nothing is found until LIMIT.")
+ (pos, prop, object, limit)
+ Lisp_Object pos, prop, object, limit;
{
register INTERVAL i, previous;
register Lisp_Object here_val;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
+
+ if (!NILP (limit))
+ CHECK_NUMBER_COERCE_MARKER (limit, 0);
i = validate_interval_range (object, &pos, &pos, soft);
+
+ /* Start with the interval containing the char before point. */
+ if (! NULL_INTERVAL_P (i) && i->position == XFASTINT (pos))
+ i = previous_interval (i);
+
if (NULL_INTERVAL_P (i))
- return Qnil;
+ return limit;
here_val = textget (i->plist, prop);
previous = previous_interval (i);
while (! NULL_INTERVAL_P (previous)
- && EQ (here_val, textget (previous->plist, prop)))
+ && EQ (here_val, textget (previous->plist, prop))
+ && (NILP (limit)
+ || previous->position + LENGTH (previous) > XFASTINT (limit)))
previous = previous_interval (previous);
if (NULL_INTERVAL_P (previous))
- return Qnil;
-
- return (previous->position + LENGTH (previous) - 1
- - (XTYPE (object) == Lisp_String));
+ return limit;
+ if (!NILP (limit)
+ && !(previous->position + LENGTH (previous) > XFASTINT (limit)))
+ return limit;
+
+ XSETFASTINT (pos, (previous->position + LENGTH (previous)
+ - (STRINGP (object))));
+ return pos;
}
+/* Callers note, this can GC when OBJECT is a buffer (or nil). */
+
DEFUN ("add-text-properties", Fadd_text_properties,
Sadd_text_properties, 3, 4, 0,
"Add properties to the text from START to END.\n\
{
register INTERVAL i, unchanged;
register int s, len, modified = 0;
+ struct gcpro gcpro1;
properties = validate_plist (properties);
if (NILP (properties))
return Qnil;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
i = validate_interval_range (object, &start, &end, hard);
if (NULL_INTERVAL_P (i))
s = XINT (start);
len = XINT (end) - s;
+ /* No need to protect OBJECT, because we GC only if it's a buffer,
+ and live buffers are always protected. */
+ GCPRO1 (properties);
+
/* If we're not starting on an interval boundary, we have to
split this interval. */
if (i->position != s)
else
{
unchanged = i;
- i = split_interval_right (unchanged, s - unchanged->position + 1);
+ i = split_interval_right (unchanged, s - unchanged->position);
copy_properties (unchanged, i);
}
}
if (LENGTH (i) >= len)
{
+ /* We can UNGCPRO safely here, because there will be just
+ one more chance to gc, in the next call to add_properties,
+ and after that we will not need PROPERTIES or OBJECT again. */
+ UNGCPRO;
+
if (interval_has_all_properties (properties, i))
return modified ? Qt : Qnil;
/* i doesn't have the properties, and goes past the change limit */
unchanged = i;
- i = split_interval_left (unchanged, len + 1);
+ i = split_interval_left (unchanged, len);
copy_properties (unchanged, i);
add_properties (properties, i, object);
return Qt;
}
}
+/* Callers note, this can GC when OBJECT is a buffer (or nil). */
+
DEFUN ("put-text-property", Fput_text_property,
Sput_text_property, 4, 5, 0,
"Set one property of the text from START to END.\n\
register INTERVAL i, unchanged;
register INTERVAL prev_changed = NULL_INTERVAL;
register int s, len;
+ Lisp_Object ostart, oend;
+
+ ostart = start;
+ oend = end;
props = validate_plist (props);
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
+
+ /* If we want no properties for a whole string,
+ get rid of its intervals. */
+ if (NILP (props) && STRINGP (object)
+ && XFASTINT (start) == 0
+ && XFASTINT (end) == XSTRING (object)->size)
+ {
+ XSTRING (object)->intervals = 0;
+ return Qt;
+ }
+
+ i = validate_interval_range (object, &start, &end, soft);
- i = validate_interval_range (object, &start, &end, hard);
if (NULL_INTERVAL_P (i))
- return Qnil;
+ {
+ /* If buffer has no props, and we want none, return now. */
+ if (NILP (props))
+ return Qnil;
+
+ /* Restore the original START and END values
+ because validate_interval_range increments them for strings. */
+ start = ostart;
+ end = oend;
+
+ i = validate_interval_range (object, &start, &end, hard);
+ /* This can return if start == end. */
+ if (NULL_INTERVAL_P (i))
+ return Qnil;
+ }
s = XINT (start);
len = XINT (end) - s;
if (i->position != s)
{
unchanged = i;
- i = split_interval_right (unchanged, s - unchanged->position + 1);
+ i = split_interval_right (unchanged, s - unchanged->position);
if (LENGTH (i) > len)
{
copy_properties (unchanged, i);
- i = split_interval_left (i, len + 1);
+ i = split_interval_left (i, len);
set_properties (props, i, object);
return Qt;
}
if (LENGTH (i) >= len)
{
if (LENGTH (i) > len)
- i = split_interval_left (i, len + 1);
+ i = split_interval_left (i, len);
if (NULL_INTERVAL_P (prev_changed))
set_properties (props, i, object);
register int s, len, modified = 0;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
i = validate_interval_range (object, &start, &end, soft);
if (NULL_INTERVAL_P (i))
else
{
unchanged = i;
- i = split_interval_right (unchanged, s - unchanged->position + 1);
+ i = split_interval_right (unchanged, s - unchanged->position);
copy_properties (unchanged, i);
}
}
/* i has the properties, and goes past the change limit */
unchanged = i;
- i = split_interval_left (i, len + 1);
+ i = split_interval_left (i, len);
copy_properties (unchanged, i);
remove_properties (props, i, object);
return Qt;
}
}
+DEFUN ("text-property-any", Ftext_property_any,
+ Stext_property_any, 4, 5, 0,
+ "Check text from START to END to see if PROP is ever `eq' to VALUE.\n\
+If so, return the position of the first character whose PROP is `eq'\n\
+to VALUE. Otherwise return nil.\n\
+The optional fifth argument, OBJECT, is the string or buffer\n\
+containing the text.")
+ (start, end, prop, value, object)
+ Lisp_Object start, end, prop, value, object;
+{
+ register INTERVAL i;
+ register int e, pos;
+
+ if (NILP (object))
+ XSETBUFFER (object, current_buffer);
+ i = validate_interval_range (object, &start, &end, soft);
+ if (NULL_INTERVAL_P (i))
+ return (!NILP (value) || EQ (start, end) ? Qnil : start);
+ e = XINT (end);
+
+ while (! NULL_INTERVAL_P (i))
+ {
+ if (i->position >= e)
+ break;
+ if (EQ (textget (i->plist, prop), value))
+ {
+ pos = i->position;
+ if (pos < XINT (start))
+ pos = XINT (start);
+ return make_number (pos - (STRINGP (object)));
+ }
+ i = next_interval (i);
+ }
+ return Qnil;
+}
+
+DEFUN ("text-property-not-all", Ftext_property_not_all,
+ Stext_property_not_all, 4, 5, 0,
+ "Check text from START to END to see if PROP is ever not `eq' to VALUE.\n\
+If so, return the position of the first character whose PROP is not\n\
+`eq' to VALUE. Otherwise, return nil.\n\
+The optional fifth argument, OBJECT, is the string or buffer\n\
+containing the text.")
+ (start, end, prop, value, object)
+ Lisp_Object start, end, prop, value, object;
+{
+ register INTERVAL i;
+ register int s, e;
+
+ if (NILP (object))
+ XSETBUFFER (object, current_buffer);
+ i = validate_interval_range (object, &start, &end, soft);
+ if (NULL_INTERVAL_P (i))
+ return (NILP (value) || EQ (start, end)) ? Qnil : start;
+ s = XINT (start);
+ e = XINT (end);
+
+ while (! NULL_INTERVAL_P (i))
+ {
+ if (i->position >= e)
+ break;
+ if (! EQ (textget (i->plist, prop), value))
+ {
+ if (i->position > s)
+ s = i->position;
+ return make_number (s - (STRINGP (object)));
+ }
+ i = next_interval (i);
+ }
+ return Qnil;
+}
+
#if 0 /* You can use set-text-properties for this. */
DEFUN ("erase-text-properties", Ferase_text_properties,
register int s, len, modified;
if (NILP (object))
- XSET (object, Lisp_Buffer, current_buffer);
+ XSETBUFFER (object, current_buffer);
i = validate_interval_range (object, &start, &end, soft);
if (NULL_INTERVAL_P (i))
/* If there are properties here, then this text will be modified. */
if (! NILP (i->plist))
{
- i = split_interval_right (unchanged, s - unchanged->position + 1);
+ i = split_interval_right (unchanged, s - unchanged->position);
i->plist = Qnil;
modified++;
if (LENGTH (i) > len)
{
- i = split_interval_right (i, len + 1);
+ i = split_interval_right (i, len);
copy_properties (unchanged, i);
return Qt;
}
}
if (LENGTH (i) > len)
- i = split_interval_left (i, len + 1);
+ i = split_interval_left (i, len);
if (! NULL_INTERVAL_P (prev_changed))
merge_interval_left (i);
else
}
#endif /* 0 */
+/* I don't think this is the right interface to export; how often do you
+ want to do something like this, other than when you're copying objects
+ around?
+
+ I think it would be better to have a pair of functions, one which
+ returns the text properties of a region as a list of ranges and
+ plists, and another which applies such a list to another object. */
+
+/* Add properties from SRC to SRC of SRC, starting at POS in DEST.
+ SRC and DEST may each refer to strings or buffers.
+ Optional sixth argument PROP causes only that property to be copied.
+ Properties are copied to DEST as if by `add-text-properties'.
+ Return t if any property value actually changed, nil otherwise. */
+
+/* Note this can GC when DEST is a buffer. */
+
+Lisp_Object
+copy_text_properties (start, end, src, pos, dest, prop)
+ Lisp_Object start, end, src, pos, dest, prop;
+{
+ INTERVAL i;
+ Lisp_Object res;
+ Lisp_Object stuff;
+ Lisp_Object plist;
+ int s, e, e2, p, len, modified = 0;
+ struct gcpro gcpro1, gcpro2;
+
+ i = validate_interval_range (src, &start, &end, soft);
+ if (NULL_INTERVAL_P (i))
+ return Qnil;
+
+ CHECK_NUMBER_COERCE_MARKER (pos, 0);
+ {
+ Lisp_Object dest_start, dest_end;
+
+ dest_start = pos;
+ XSETFASTINT (dest_end, XINT (dest_start) + (XINT (end) - XINT (start)));
+ /* Apply this to a copy of pos; it will try to increment its arguments,
+ which we don't want. */
+ validate_interval_range (dest, &dest_start, &dest_end, soft);
+ }
+
+ s = XINT (start);
+ e = XINT (end);
+ p = XINT (pos);
+
+ stuff = Qnil;
+
+ while (s < e)
+ {
+ e2 = i->position + LENGTH (i);
+ if (e2 > e)
+ e2 = e;
+ len = e2 - s;
+
+ plist = i->plist;
+ if (! NILP (prop))
+ while (! NILP (plist))
+ {
+ if (EQ (Fcar (plist), prop))
+ {
+ plist = Fcons (prop, Fcons (Fcar (Fcdr (plist)), Qnil));
+ break;
+ }
+ plist = Fcdr (Fcdr (plist));
+ }
+ if (! NILP (plist))
+ {
+ /* Must defer modifications to the interval tree in case src
+ and dest refer to the same string or buffer. */
+ stuff = Fcons (Fcons (make_number (p),
+ Fcons (make_number (p + len),
+ Fcons (plist, Qnil))),
+ stuff);
+ }
+
+ i = next_interval (i);
+ if (NULL_INTERVAL_P (i))
+ break;
+
+ p += len;
+ s = i->position;
+ }
+
+ GCPRO2 (stuff, dest);
+
+ while (! NILP (stuff))
+ {
+ res = Fcar (stuff);
+ res = Fadd_text_properties (Fcar (res), Fcar (Fcdr (res)),
+ Fcar (Fcdr (Fcdr (res))), dest);
+ if (! NILP (res))
+ modified++;
+ stuff = Fcdr (stuff);
+ }
+
+ UNGCPRO;
+
+ return modified ? Qt : Qnil;
+}
+
void
syms_of_textprop ()
{
- DEFVAR_INT ("interval-balance-threshold", &interval_balance_threshold,
- "Threshold for rebalancing interval trees, expressed as the\n\
-percentage by which the left interval tree should not differ from the right.");
- interval_balance_threshold = 8;
-
+ DEFVAR_LISP ("default-properties", &Vdefault_properties,
+ "Property-list used as default values.\n\
+The value of a property in this list is seen as the value for every character\n\
+that does not have its own value for that property.");
+ Vdefault_properties = Qnil;
+
+ DEFVAR_LISP ("inhibit-point-motion-hooks", &Vinhibit_point_motion_hooks,
+ "If non-nil, don't run `point-left' and `point-entered' text properties.\n\
+This also inhibits the use of the `intangible' text property.");
+ Vinhibit_point_motion_hooks = Qnil;
+
/* Common attributes one might give text */
staticpro (&Qforeground);
Qread_only = intern ("read-only");
staticpro (&Qinvisible);
Qinvisible = intern ("invisible");
+ staticpro (&Qintangible);
+ Qintangible = intern ("intangible");
staticpro (&Qcategory);
Qcategory = intern ("category");
staticpro (&Qlocal_map);
Qlocal_map = intern ("local-map");
+ staticpro (&Qfront_sticky);
+ Qfront_sticky = intern ("front-sticky");
+ staticpro (&Qrear_nonsticky);
+ Qrear_nonsticky = intern ("rear-nonsticky");
/* Properties that text might use to specify certain actions */
Qpoint_left = intern ("point-left");
staticpro (&Qpoint_entered);
Qpoint_entered = intern ("point-entered");
- staticpro (&Qmodification_hooks);
- Qmodification_hooks = intern ("modification-hooks");
defsubr (&Stext_properties_at);
defsubr (&Sget_text_property);
+ defsubr (&Sget_char_property);
defsubr (&Snext_property_change);
defsubr (&Snext_single_property_change);
defsubr (&Sprevious_property_change);
defsubr (&Sput_text_property);
defsubr (&Sset_text_properties);
defsubr (&Sremove_text_properties);
+ defsubr (&Stext_property_any);
+ defsubr (&Stext_property_not_all);
/* defsubr (&Serase_text_properties); */
+/* defsubr (&Scopy_text_properties); */
}
#else