X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/26c76ace8de7d0fa687d8a76b3a3bce5fb1ee692..ce6b02e050118c7bc5837bda0f6bc5568870fc91:/src/textprop.c diff --git a/src/textprop.c b/src/textprop.c index 27698f925e..f96e6bb6e7 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1,5 +1,5 @@ /* Interface code for dealing with text properties. - Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -44,12 +44,10 @@ Boston, MA 02111-1307, USA. */ only once on the list. Although some code i.e., remove_properties, handles the more general case, the uniqueness of properties is necessary for the system to remain consistent. This requirement - is enforced by the subrs installing properties onto the intervals. */ + is enforced by the subrs installing properties onto the intervals. */ -/* The rest of the file is within this conditional */ -#ifdef USE_TEXT_PROPERTIES -/* Types of hooks. */ +/* Types of hooks. */ Lisp_Object Qmouse_left; Lisp_Object Qmouse_entered; Lisp_Object Qpoint_left; @@ -57,9 +55,9 @@ Lisp_Object Qpoint_entered; Lisp_Object Qcategory; Lisp_Object Qlocal_map; -/* Visual properties text (including strings) may have. */ +/* Visual properties text (including strings) may have. */ Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple; -Lisp_Object Qinvisible, Qread_only, Qintangible; +Lisp_Object Qinvisible, Qread_only, Qintangible, Qmouse_face; /* Sticky properties */ Lisp_Object Qfront_sticky, Qrear_nonsticky; @@ -67,10 +65,11 @@ 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))) +#define PLIST_ELT_P(o1, o2) (CONSP (o1) && ((o2)=XCDR (o1), CONSP (o2))) Lisp_Object Vinhibit_point_motion_hooks; Lisp_Object Vdefault_text_properties; +Lisp_Object Vtext_property_default_nonsticky; /* verify_interval_modification saves insertion hooks here to be run later by report_interval_modification. */ @@ -103,7 +102,7 @@ Lisp_Object interval_insert_in_front_hooks; #define soft 0 #define hard 1 -static INTERVAL +INTERVAL validate_interval_range (object, begin, end, force) Lisp_Object object, *begin, *end; int force; @@ -116,7 +115,7 @@ validate_interval_range (object, begin, end, force) CHECK_NUMBER_COERCE_MARKER (*end, 0); /* If we are asked for a point, but from a subr which operates - on a range, then return nothing. */ + on a range, then return nothing. */ if (EQ (*begin, *end) && begin != end) return NULL_INTERVAL; @@ -137,7 +136,7 @@ validate_interval_range (object, begin, end, force) args_out_of_range (*begin, *end); i = BUF_INTERVALS (b); - /* If there's no text, there are no properties. */ + /* If there's no text, there are no properties. */ if (BUF_BEGV (b) == BUF_ZV (b)) return NULL_INTERVAL; @@ -150,11 +149,9 @@ validate_interval_range (object, begin, end, force) if (! (0 <= XINT (*begin) && XINT (*begin) <= XINT (*end) && XINT (*end) <= s->size)) args_out_of_range (*begin, *end); - /* User-level Positions in strings start with 0, - but the interval code always wants positions starting with 1. */ - XSETFASTINT (*begin, XFASTINT (*begin) + 1); + XSETFASTINT (*begin, XFASTINT (*begin)); if (begin != end) - XSETFASTINT (*end, XFASTINT (*end) + 1); + XSETFASTINT (*end, XFASTINT (*end)); i = s->intervals; if (s->size == 0) @@ -171,7 +168,7 @@ validate_interval_range (object, begin, end, force) /* Validate LIST as a property list. If LIST is not a list, then make one consisting of (LIST nil). Otherwise, verify that LIST - is even numbered and thus suitable as a plist. */ + is even numbered and thus suitable as a plist. */ static Lisp_Object validate_plist (list) @@ -198,17 +195,17 @@ validate_plist (list) } /* Return nonzero if interval I has all the properties, - with the same values, of list PLIST. */ + with the same values, of list PLIST. */ static int interval_has_all_properties (plist, i) Lisp_Object plist; INTERVAL i; { - register Lisp_Object tail1, tail2, sym1, sym2; + register Lisp_Object tail1, tail2, sym1; register int found; - /* Go through each element of PLIST. */ + /* Go through each element of PLIST. */ for (tail1 = plist; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1))) { sym1 = Fcar (tail1); @@ -219,11 +216,11 @@ interval_has_all_properties (plist, i) if (EQ (sym1, Fcar (tail2))) { /* Found the same property on both lists. If the - values are unequal, return zero. */ + values are unequal, return zero. */ if (! EQ (Fcar (Fcdr (tail1)), Fcar (Fcdr (tail2)))) return 0; - /* Property has same value on both lists; go to next one. */ + /* Property has same value on both lists; go to next one. */ found = 1; break; } @@ -236,7 +233,7 @@ interval_has_all_properties (plist, i) } /* Return nonzero if the plist of interval I has any of the - properties of PLIST, regardless of their values. */ + properties of PLIST, regardless of their values. */ static INLINE int interval_has_some_properties (plist, i) @@ -245,7 +242,7 @@ interval_has_some_properties (plist, i) { register Lisp_Object tail1, tail2, sym; - /* Go through each element of PLIST. */ + /* Go through each element of PLIST. */ for (tail1 = plist; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1))) { sym = Fcar (tail1); @@ -270,10 +267,10 @@ property_value (plist, prop) Lisp_Object value; while (PLIST_ELT_P (plist, value)) - if (EQ (XCONS (plist)->car, prop)) - return XCONS (value)->car; + if (EQ (XCAR (plist), prop)) + return XCAR (value); else - plist = XCONS (value)->cdr; + plist = XCDR (value); return Qunbound; } @@ -295,12 +292,12 @@ set_properties (properties, interval, object) 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)) + sym = XCDR (value)) + if (! EQ (property_value (properties, XCAR (sym)), + XCAR (value))) { record_property_change (interval->position, LENGTH (interval), - XCONS (sym)->car, XCONS (value)->car, + XCAR (sym), XCAR (value), object); } @@ -308,11 +305,11 @@ set_properties (properties, interval, object) 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)) + sym = XCDR (value)) + if (EQ (property_value (interval->plist, XCAR (sym)), Qunbound)) { record_property_change (interval->position, LENGTH (interval), - XCONS (sym)->car, Qnil, + XCAR (sym), Qnil, object); } } @@ -349,7 +346,7 @@ add_properties (plist, i, object) I and its plist are also protected, via OBJECT. */ GCPRO3 (tail1, sym1, val1); - /* Go through each element of PLIST. */ + /* Go through each element of PLIST. */ for (tail1 = plist; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1))) { sym1 = Fcar (tail1); @@ -365,11 +362,11 @@ add_properties (plist, i, object) register Lisp_Object this_cdr; this_cdr = Fcdr (tail2); - /* Found the property. Now check its value. */ + /* Found the property. Now check its value. */ found = 1; /* The properties have the same value on both lists. - Continue to the next property. */ + Continue to the next property. */ if (EQ (val1, Fcar (this_cdr))) break; @@ -418,7 +415,7 @@ remove_properties (plist, i, object) register int changed = 0; current_plist = i->plist; - /* Go through each element of plist. */ + /* Go through each element of plist. */ for (tail1 = plist; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1))) { sym = Fcar (tail1); @@ -465,7 +462,7 @@ remove_properties (plist, i, object) #if 0 /* Remove all properties from interval I. Return non-zero - if this changes the interval. */ + if this changes the interval. */ static INLINE int erase_properties (i) @@ -479,11 +476,54 @@ erase_properties (i) } #endif +/* Returns the interval of POSITION in OBJECT. + POSITION is BEG-based. */ + +INTERVAL +interval_of (position, object) + int position; + Lisp_Object object; +{ + register INTERVAL i; + int beg, end; + + if (NILP (object)) + XSETBUFFER (object, current_buffer); + else if (EQ (object, Qt)) + return NULL_INTERVAL; + + CHECK_STRING_OR_BUFFER (object, 0); + + if (BUFFERP (object)) + { + register struct buffer *b = XBUFFER (object); + + beg = BUF_BEGV (b); + end = BUF_ZV (b); + i = BUF_INTERVALS (b); + } + else + { + register struct Lisp_String *s = XSTRING (object); + + beg = 0; + end = s->size; + i = s->intervals; + } + + if (!(beg <= position && position <= end)) + args_out_of_range (make_number (position), make_number (position)); + if (beg == end || NULL_INTERVAL_P (i)) + return NULL_INTERVAL; + + return find_interval (i, position); +} + DEFUN ("text-properties-at", Ftext_properties_at, Stext_properties_at, 1, 2, 0, - "Return the list of properties held by the character at POSITION\n\ -in optional argument OBJECT, a string or buffer. If nil, OBJECT\n\ -defaults to the current buffer.\n\ + "Return the list of properties of the character at POSITION in OBJECT.\n\ +OBJECT is the string or buffer to look for the properties in;\n\ +nil means the current buffer.\n\ If POSITION is at the end of OBJECT, the value is nil.") (position, object) Lisp_Object position, object; @@ -584,7 +624,200 @@ overlays are considered only if they are associated with OBJECT.") simpler case. */ return (Fget_text_property (position, prop, object)); } + +DEFUN ("next-char-property-change", Fnext_char_property_change, + Snext_char_property_change, 1, 2, 0, + "Return the position of next text property or overlay change.\n\ +This scans characters forward from POSITION in OBJECT till it finds\n\ +a change in some text property, or the beginning or end of an overlay,\n\ +and returns the position of that.\n\ +If none is found, the function returns (point-max).\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.") + (position, limit) + Lisp_Object position, limit; +{ + Lisp_Object temp; + + temp = Fnext_overlay_change (position); + if (! NILP (limit)) + { + CHECK_NUMBER (limit, 2); + if (XINT (limit) < XINT (temp)) + temp = limit; + } + return Fnext_property_change (position, Qnil, temp); +} + +DEFUN ("previous-char-property-change", Fprevious_char_property_change, + Sprevious_char_property_change, 1, 2, 0, + "Return the position of previous text property or overlay change.\n\ +Scans characters backward from POSITION in OBJECT till it finds\n\ +a change in some text property, or the beginning or end of an overlay,\n\ +and returns the position of that.\n\ +If none is found, the function returns (point-max).\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.") + (position, limit) + Lisp_Object position, limit; +{ + Lisp_Object temp; + + temp = Fprevious_overlay_change (position); + if (! NILP (limit)) + { + CHECK_NUMBER (limit, 2); + if (XINT (limit) > XINT (temp)) + temp = limit; + } + return Fprevious_property_change (position, Qnil, temp); +} + + +DEFUN ("next-single-char-property-change", Fnext_single_char_property_change, + Snext_single_char_property_change, 2, 4, 0, + "Return the position of next text property or overlay change for a specific property.\n\ +Scans characters forward from POSITION 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 POSITION, 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.") + (position, prop, object, limit) + Lisp_Object prop, position, object, limit; +{ + if (STRINGP (object)) + { + position = Fnext_single_property_change (position, prop, object, limit); + if (NILP (position)) + { + if (NILP (limit)) + position = make_number (XSTRING (object)->size); + else + position = limit; + } + } + else + { + Lisp_Object initial_value, value; + int count = specpdl_ptr - specpdl; + + if (! NILP (object)) + CHECK_BUFFER (object, 0); + + if (BUFFERP (object) && current_buffer != XBUFFER (object)) + { + record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); + Fset_buffer (object); + } + + initial_value = Fget_char_property (position, prop, object); + + if (NILP (limit)) + XSETFASTINT (limit, BUF_ZV (current_buffer)); + else + CHECK_NUMBER_COERCE_MARKER (limit, 0); + + for (;;) + { + position = Fnext_char_property_change (position, limit); + if (XFASTINT (position) >= XFASTINT (limit)) { + position = limit; + break; + } + + value = Fget_char_property (position, prop, object); + if (!EQ (value, initial_value)) + break; + } + + unbind_to (count, Qnil); + } + + return position; +} +DEFUN ("previous-single-char-property-change", + Fprevious_single_char_property_change, + Sprevious_single_char_property_change, 2, 4, 0, + "Return the position of previous text property or overlay change for a specific property.\n\ +Scans characters backward from POSITION 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 POSITION, 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 before LIMIT.") + (position, prop, object, limit) + Lisp_Object prop, position, object, limit; +{ + if (STRINGP (object)) + { + position = Fprevious_single_property_change (position, prop, object, limit); + if (NILP (position)) + { + if (NILP (limit)) + position = make_number (XSTRING (object)->size); + else + position = limit; + } + } + else + { + int count = specpdl_ptr - specpdl; + + if (! NILP (object)) + CHECK_BUFFER (object, 0); + + if (BUFFERP (object) && current_buffer != XBUFFER (object)) + { + record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); + Fset_buffer (object); + } + + if (NILP (limit)) + XSETFASTINT (limit, BUF_BEGV (current_buffer)); + else + CHECK_NUMBER_COERCE_MARKER (limit, 0); + + if (XFASTINT (position) <= XFASTINT (limit)) + position = limit; + else + { + Lisp_Object initial_value = + Fget_char_property (position - 1, prop, object); + + for (;;) + { + position = Fprevious_char_property_change (position, limit); + + if (XFASTINT (position) <= XFASTINT (limit)) + { + position = limit; + break; + } + else + { + Lisp_Object value = + Fget_char_property (position - 1, prop, object); + + if (!EQ (value, initial_value)) + break; + } + } + } + + unbind_to (count, Qnil); + } + + return position; +} + DEFUN ("next-property-change", Fnext_property_change, Snext_property_change, 1, 3, 0, "Return the position of next property change.\n\ @@ -622,7 +855,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") ? XSTRING (object)->size : BUF_ZV (XBUFFER (object)))); else - XSETFASTINT (position, next->position - (STRINGP (object))); + XSETFASTINT (position, next->position); return position; } @@ -640,7 +873,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") if (! NILP (limit) && !(next->position < XFASTINT (limit))) return limit; - XSETFASTINT (position, next->position - (STRINGP (object))); + XSETFASTINT (position, next->position); return position; } @@ -715,8 +948,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") if (! NILP (limit) && !(next->position < XFASTINT (limit))) return limit; - XSETFASTINT (position, next->position - (STRINGP (object))); - return position; + return make_number (next->position); } DEFUN ("previous-property-change", Fprevious_property_change, @@ -751,7 +983,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") previous = previous_interval (i); while (! NULL_INTERVAL_P (previous) && intervals_equal (previous, i) && (NILP (limit) - || previous->position + LENGTH (previous) > XFASTINT (limit))) + || (previous->position + LENGTH (previous) > XFASTINT (limit)))) previous = previous_interval (previous); if (NULL_INTERVAL_P (previous)) return limit; @@ -759,9 +991,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") && !(previous->position + LENGTH (previous) > XFASTINT (limit))) return limit; - XSETFASTINT (position, (previous->position + LENGTH (previous) - - (STRINGP (object)))); - return position; + return make_number (previous->position + LENGTH (previous)); } DEFUN ("previous-single-property-change", Fprevious_single_property_change, @@ -801,7 +1031,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") while (! NULL_INTERVAL_P (previous) && EQ (here_val, textget (previous->plist, prop)) && (NILP (limit) - || previous->position + LENGTH (previous) > XFASTINT (limit))) + || (previous->position + LENGTH (previous) > XFASTINT (limit)))) previous = previous_interval (previous); if (NULL_INTERVAL_P (previous)) return limit; @@ -809,11 +1039,9 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") && !(previous->position + LENGTH (previous) > XFASTINT (limit))) return limit; - XSETFASTINT (position, (previous->position + LENGTH (previous) - - (STRINGP (object)))); - return position; + return make_number (previous->position + LENGTH (previous)); } - + /* Callers note, this can GC when OBJECT is a buffer (or nil). */ DEFUN ("add-text-properties", Fadd_text_properties, @@ -850,11 +1078,11 @@ Return t if any property value actually changed, nil otherwise.") GCPRO1 (properties); /* If we're not starting on an interval boundary, we have to - split this interval. */ + split this interval. */ if (i->position != s) { /* If this interval already has the properties, we can - skip it. */ + skip it. */ if (interval_has_all_properties (properties, i)) { int got = (LENGTH (i) - (s - i->position)); @@ -871,7 +1099,8 @@ Return t if any property value actually changed, nil otherwise.") } } - modify_region (XBUFFER (object), XINT (start), XINT (end)); + if (BUFFERP (object)) + modify_region (XBUFFER (object), XINT (start), XINT (end)); /* We are at the beginning of interval I, with LEN chars to scan. */ for (;;) @@ -888,8 +1117,9 @@ Return t if any property value actually changed, nil otherwise.") if (interval_has_all_properties (properties, i)) { - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return modified ? Qt : Qnil; } @@ -897,8 +1127,9 @@ Return t if any property value actually changed, nil otherwise.") if (LENGTH (i) == len) { add_properties (properties, i, object); - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -907,8 +1138,9 @@ Return t if any property value actually changed, nil otherwise.") i = split_interval_left (unchanged, len); copy_properties (unchanged, i); add_properties (properties, i, object); - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -944,12 +1176,26 @@ The optional fourth argument, OBJECT,\n\ is the string or buffer containing the text.") (start, end, properties, object) Lisp_Object start, end, properties, object; +{ + return set_text_properties (start, end, properties, object, Qt); +} + + +/* Replace properties of text from START to END with new list of + properties PROPERTIES. OBJECT is the buffer or string containing + the text. OBJECT nil means use the current buffer. + SIGNAL_AFTER_CHANGE_P nil means don't signal after changes. Value + is non-nil if properties were replaced; it is nil if there weren't + any properties to replace. */ + +Lisp_Object +set_text_properties (start, end, properties, object, signal_after_change_p) + Lisp_Object start, end, properties, object, signal_after_change_p; { register INTERVAL i, unchanged; register INTERVAL prev_changed = NULL_INTERVAL; register int s, len; Lisp_Object ostart, oend; - int have_modified = 0; ostart = start; oend = end; @@ -968,10 +1214,7 @@ is the string or buffer containing the text.") if (! XSTRING (object)->intervals) return Qt; - modify_region (XBUFFER (object), XINT (start), XINT (end)); XSTRING (object)->intervals = 0; - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); return Qt; } @@ -997,7 +1240,8 @@ is the string or buffer containing the text.") s = XINT (start); len = XINT (end) - s; - modify_region (XBUFFER (object), XINT (start), XINT (end)); + if (BUFFERP (object)) + modify_region (XBUFFER (object), XINT (start), XINT (end)); if (i->position != s) { @@ -1009,8 +1253,9 @@ is the string or buffer containing the text.") copy_properties (unchanged, i); i = split_interval_left (i, len); set_properties (properties, i, object); - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object) && !NILP (signal_after_change_p)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -1019,8 +1264,9 @@ is the string or buffer containing the text.") if (LENGTH (i) == len) { - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object) && !NILP (signal_after_change_p)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -1047,8 +1293,9 @@ is the string or buffer containing the text.") set_properties (properties, i, object); if (!NULL_INTERVAL_P (prev_changed)) merge_interval_left (i); - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object) && !NILP (signal_after_change_p)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -1066,8 +1313,9 @@ is the string or buffer containing the text.") i = next_interval (i); } - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object) && !NILP (signal_after_change_p)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -1099,7 +1347,7 @@ Return t if any property was actually removed, nil otherwise.") if (i->position != s) { /* No properties on this first interval -- return if - it covers the entire region. */ + it covers the entire region. */ if (! interval_has_some_properties (properties, i)) { int got = (LENGTH (i) - (s - i->position)); @@ -1118,7 +1366,8 @@ Return t if any property was actually removed, nil otherwise.") } } - modify_region (XBUFFER (object), XINT (start), XINT (end)); + if (BUFFERP (object)) + modify_region (XBUFFER (object), XINT (start), XINT (end)); /* We are at the beginning of an interval, with len to scan */ for (;;) @@ -1134,8 +1383,9 @@ Return t if any property was actually removed, nil otherwise.") if (LENGTH (i) == len) { remove_properties (properties, i, object); - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -1144,8 +1394,9 @@ Return t if any property was actually removed, nil otherwise.") i = split_interval_left (i, len); copy_properties (unchanged, i); remove_properties (properties, i, object); - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); + if (BUFFERP (object)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); return Qt; } @@ -1154,7 +1405,7 @@ Return t if any property was actually removed, nil otherwise.") i = next_interval (i); } } - + DEFUN ("text-property-any", Ftext_property_any, Stext_property_any, 4, 5, 0, "Check text from START to END for property PROPERTY equalling VALUE.\n\ @@ -1184,7 +1435,7 @@ containing the text.") pos = i->position; if (pos < XINT (start)) pos = XINT (start); - return make_number (pos - (STRINGP (object))); + return make_number (pos); } i = next_interval (i); } @@ -1220,121 +1471,13 @@ containing the text.") { if (i->position > s) s = i->position; - return make_number (s - (STRINGP (object))); + return make_number (s); } i = next_interval (i); } return Qnil; } - -#if 0 /* You can use set-text-properties for this. */ - -DEFUN ("erase-text-properties", Ferase_text_properties, - Serase_text_properties, 2, 3, 0, - "Remove all properties from the text from START to END.\n\ -The optional third argument, OBJECT,\n\ -is the string or buffer containing the text.") - (start, end, object) - Lisp_Object start, end, object; -{ - register INTERVAL i; - register INTERVAL prev_changed = NULL_INTERVAL; - register int s, len, modified; - - if (NILP (object)) - XSETBUFFER (object, current_buffer); - - i = validate_interval_range (object, &start, &end, soft); - if (NULL_INTERVAL_P (i)) - return Qnil; - - s = XINT (start); - len = XINT (end) - s; - - if (i->position != s) - { - register int got; - register INTERVAL unchanged = i; - - /* If there are properties here, then this text will be modified. */ - if (! NILP (i->plist)) - { - i = split_interval_right (unchanged, s - unchanged->position); - i->plist = Qnil; - modified++; - - if (LENGTH (i) > len) - { - i = split_interval_right (i, len); - copy_properties (unchanged, i); - return Qt; - } - - if (LENGTH (i) == len) - return Qt; - - got = LENGTH (i); - } - /* If the text of I is without any properties, and contains - LEN or more characters, then we may return without changing - anything.*/ - else if (LENGTH (i) - (s - i->position) <= len) - return Qnil; - /* The amount of text to change extends past I, so just note - how much we've gotten. */ - else - got = LENGTH (i) - (s - i->position); - - len -= got; - prev_changed = i; - i = next_interval (i); - } - - /* We are starting at the beginning of an interval, I. */ - while (len > 0) - { - if (LENGTH (i) >= len) - { - /* If I has no properties, simply merge it if possible. */ - if (NILP (i->plist)) - { - if (! NULL_INTERVAL_P (prev_changed)) - merge_interval_left (i); - - return modified ? Qt : Qnil; - } - - if (LENGTH (i) > len) - i = split_interval_left (i, len); - if (! NULL_INTERVAL_P (prev_changed)) - merge_interval_left (i); - else - i->plist = Qnil; - - return Qt; - } - - /* Here if we still need to erase past the end of I */ - len -= LENGTH (i); - if (NULL_INTERVAL_P (prev_changed)) - { - modified += erase_properties (i); - prev_changed = i; - } - else - { - modified += ! NILP (i->plist); - /* Merging I will give it the properties of PREV_CHANGED. */ - prev_changed = i = merge_interval_left (i); - } - - i = next_interval (i); - } - - return modified ? Qt : Qnil; -} -#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? @@ -1404,7 +1547,7 @@ copy_text_properties (start, end, src, pos, dest, prop) if (! NILP (plist)) { /* Must defer modifications to the interval tree in case src - and dest refer to the same string or buffer. */ + and dest refer to the same string or buffer. */ stuff = Fcons (Fcons (make_number (p), Fcons (make_number (p + len), Fcons (plist, Qnil))), @@ -1435,6 +1578,123 @@ copy_text_properties (start, end, src, pos, dest, prop) return modified ? Qt : Qnil; } + + +/* Return a list representing the text properties of OBJECT between + START and END. if PROP is non-nil, report only on that property. + Each result list element has the form (S E PLIST), where S and E + are positions in OBJECT and PLIST is a property list containing the + text properties of OBJECT between S and E. Value is nil if OBJECT + doesn't contain text properties between START and END. */ + +Lisp_Object +text_property_list (object, start, end, prop) + Lisp_Object object, start, end, prop; +{ + struct interval *i; + Lisp_Object result; + + result = Qnil; + + i = validate_interval_range (object, &start, &end, soft); + if (!NULL_INTERVAL_P (i)) + { + int s = XINT (start); + int e = XINT (end); + + while (s < e) + { + int interval_end, len; + Lisp_Object plist; + + interval_end = i->position + LENGTH (i); + if (interval_end > e) + interval_end = e; + len = interval_end - s; + + plist = i->plist; + + if (!NILP (prop)) + for (; !NILP (plist); plist = Fcdr (Fcdr (plist))) + if (EQ (Fcar (plist), prop)) + { + plist = Fcons (prop, Fcons (Fcar (Fcdr (plist)), Qnil)); + break; + } + + if (!NILP (plist)) + result = Fcons (Fcons (make_number (s), + Fcons (make_number (s + len), + Fcons (plist, Qnil))), + result); + + i = next_interval (i); + if (NULL_INTERVAL_P (i)) + break; + s = i->position; + } + } + + return result; +} + + +/* Add text properties to OBJECT from LIST. LIST is a list of triples + (START END PLIST), where START and END are positions and PLIST is a + property list containing the text properties to add. Adjust START + and END positions by DELTA before adding properties. Value is + non-zero if OBJECT was modified. */ + +int +add_text_properties_from_list (object, list, delta) + Lisp_Object object, list, delta; +{ + struct gcpro gcpro1, gcpro2; + int modified_p = 0; + + GCPRO2 (list, object); + + for (; CONSP (list); list = XCDR (list)) + { + Lisp_Object item, start, end, plist, tem; + + item = XCAR (list); + start = make_number (XINT (XCAR (item)) + XINT (delta)); + end = make_number (XINT (XCAR (XCDR (item))) + XINT (delta)); + plist = XCAR (XCDR (XCDR (item))); + + tem = Fadd_text_properties (start, end, plist, object); + if (!NILP (tem)) + modified_p = 1; + } + + UNGCPRO; + return modified_p; +} + + + +/* Modify end-points of ranges in LIST destructively. LIST is a list + as returned from text_property_list. Change end-points equal to + OLD_END to NEW_END. */ + +void +extend_property_ranges (list, old_end, new_end) + Lisp_Object list, old_end, new_end; +{ + for (; CONSP (list); list = XCDR (list)) + { + Lisp_Object item, end; + + item = XCAR (list); + end = XCAR (XCDR (item)); + + if (EQ (end, old_end)) + XCAR (XCDR (item)) = new_end; + } +} + + /* Call the modification hook functions in LIST, each with START and END. */ @@ -1452,12 +1712,13 @@ call_mod_hooks (list, start, end) UNGCPRO; } -/* Check for read-only intervals and signal an error if we find one. - Then check for any modification hooks in the range START up to - (but not including) END. Create a list of all these hooks in - lexicographic order, eliminating consecutive extra copies of the - same hook. Then call those hooks in order, with START and END - 1 - as arguments. */ +/* Check for read-only intervals between character positions START ... END, + in BUF, and signal an error if we find one. + + Then check for any modification hooks in the range. + Create a list of all these hooks in lexicographic order, + eliminating consecutive extra copies of the same hook. Then call + those hooks in order, with START and END - 1 as arguments. */ void verify_interval_modification (buf, start, end) @@ -1465,7 +1726,7 @@ verify_interval_modification (buf, start, end) int start, end; { register INTERVAL intervals = BUF_INTERVALS (buf); - register INTERVAL i, prev; + register INTERVAL i; Lisp_Object hooks; register Lisp_Object prev_mod_hooks; Lisp_Object mod_hooks; @@ -1513,7 +1774,7 @@ verify_interval_modification (buf, start, end) if (NILP (Vinhibit_read_only) || CONSP (Vinhibit_read_only)) { /* If I and PREV differ we need to check for the read-only - property together with its stickiness. If either I or + property together with its stickiness. If either I or PREV are 0, this check is all we need. We have to take special care, since read-only may be indirectly defined via the category property. */ @@ -1535,7 +1796,7 @@ verify_interval_modification (buf, start, end) if (TMEM (Qread_only, tem) || (NILP (Fplist_get (i->plist, Qread_only)) && TMEM (Qcategory, tem))) - error ("Attempt to insert within read-only text"); + Fsignal (Qtext_read_only, Qnil); } } @@ -1555,7 +1816,7 @@ verify_interval_modification (buf, start, end) if (! TMEM (Qread_only, tem) && (! NILP (Fplist_get (prev->plist,Qread_only)) || ! TMEM (Qcategory, tem))) - error ("Attempt to insert within read-only text"); + Fsignal (Qtext_read_only, Qnil); } } } @@ -1574,13 +1835,13 @@ verify_interval_modification (buf, start, end) if (TMEM (Qread_only, tem) || (NILP (Fplist_get (i->plist, Qread_only)) && TMEM (Qcategory, tem))) - error ("Attempt to insert within read-only text"); + Fsignal (Qtext_read_only, Qnil); tem = textget (prev->plist, Qrear_nonsticky); if (! TMEM (Qread_only, tem) && (! NILP (Fplist_get (prev->plist, Qread_only)) || ! TMEM (Qcategory, tem))) - error ("Attempt to insert within read-only text"); + Fsignal (Qtext_read_only, Qnil); } } } @@ -1602,7 +1863,7 @@ verify_interval_modification (buf, start, end) do { if (! INTERVAL_WRITABLE_P (i)) - error ("Attempt to modify read-only text"); + Fsignal (Qtext_read_only, Qnil); mod_hooks = textget (i->plist, Qmodification_hooks); if (! NILP (mod_hooks) && ! EQ (mod_hooks, prev_mod_hooks)) @@ -1628,7 +1889,7 @@ verify_interval_modification (buf, start, end) } } -/* Run the interval hooks for an insertion. +/* Run the interval hooks for an insertion on character range START ... END. verify_interval_modification chose which hooks to run; this function is called after the insertion happens so it can indicate the range of inserted text. */ @@ -1638,13 +1899,11 @@ report_interval_modification (start, end) Lisp_Object start, end; { if (! NILP (interval_insert_behind_hooks)) - call_mod_hooks (interval_insert_behind_hooks, - make_number (start), make_number (end)); + call_mod_hooks (interval_insert_behind_hooks, start, end); if (! NILP (interval_insert_in_front_hooks) && ! EQ (interval_insert_in_front_hooks, interval_insert_behind_hooks)) - call_mod_hooks (interval_insert_in_front_hooks, - make_number (start), make_number (end)); + call_mod_hooks (interval_insert_in_front_hooks, start, end); } void @@ -1661,6 +1920,17 @@ character that does not have its own value for that property."); This also inhibits the use of the `intangible' text property."); Vinhibit_point_motion_hooks = Qnil; + DEFVAR_LISP ("text-property-default-nonsticky", + &Vtext_property_default_nonsticky, + "Alist of properties vs the corresponding non-stickinesses.\n\ +Each element has the form (PROPERTY . NONSTICKINESS).\n\ +\n\ +If a character in a buffer has PROPERTY, new text inserted adjacent to\n\ +the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil,\n\ +inherits it if NONSTICKINESS is nil. The front-sticky and\n\ +rear-nonsticky properties of the character overrides NONSTICKINESS."); + Vtext_property_default_nonsticky = Qnil; + staticpro (&interval_insert_behind_hooks); staticpro (&interval_insert_in_front_hooks); interval_insert_behind_hooks = Qnil; @@ -1693,6 +1963,8 @@ This also inhibits the use of the `intangible' text property."); Qfront_sticky = intern ("front-sticky"); staticpro (&Qrear_nonsticky); Qrear_nonsticky = intern ("rear-nonsticky"); + staticpro (&Qmouse_face); + Qmouse_face = intern ("mouse-face"); /* Properties that text might use to specify certain actions */ @@ -1708,6 +1980,10 @@ This also inhibits the use of the `intangible' text property."); defsubr (&Stext_properties_at); defsubr (&Sget_text_property); defsubr (&Sget_char_property); + defsubr (&Snext_char_property_change); + defsubr (&Sprevious_char_property_change); + defsubr (&Snext_single_char_property_change); + defsubr (&Sprevious_single_char_property_change); defsubr (&Snext_property_change); defsubr (&Snext_single_property_change); defsubr (&Sprevious_property_change); @@ -1722,8 +1998,3 @@ This also inhibits the use of the `intangible' text property."); /* defsubr (&Scopy_text_properties); */ } -#else - -lose -- this shouldn't be compiled if USE_TEXT_PROPERTIES isn't defined - -#endif /* USE_TEXT_PROPERTIES */