X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bf9e8804fc42e4102cf84f39dfcdd2f069013bdd..5180cc015e2cca6f8cb635044ac4643cf83276cb:/src/textprop.c diff --git a/src/textprop.c b/src/textprop.c index e53d77825f..7c6a5e6d68 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1,5 +1,6 @@ /* Interface code for dealing with text properties. - Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -75,6 +76,18 @@ Lisp_Object Vtext_property_default_nonsticky; to be run later by report_interval_modification. */ Lisp_Object interval_insert_behind_hooks; Lisp_Object interval_insert_in_front_hooks; + + +/* Signal a `text-read-only' error. This function makes it easier + to capture that error in GDB by putting a breakpoint on it. */ + +static void +text_read_only () +{ + Fsignal (Qtext_read_only, Qnil); +} + + /* Extract the interval at the position pointed to by BEGIN from OBJECT, a string or buffer. Additionally, check that the positions @@ -110,9 +123,9 @@ validate_interval_range (object, begin, end, force) register INTERVAL i; int searchpos; - CHECK_STRING_OR_BUFFER (object, 0); - CHECK_NUMBER_COERCE_MARKER (*begin, 0); - CHECK_NUMBER_COERCE_MARKER (*end, 0); + CHECK_STRING_OR_BUFFER (object); + CHECK_NUMBER_COERCE_MARKER (*begin); + CHECK_NUMBER_COERCE_MARKER (*end); /* If we are asked for a point, but from a subr which operates on a range, then return nothing. */ @@ -492,7 +505,7 @@ interval_of (position, object) else if (EQ (object, Qt)) return NULL_INTERVAL; - CHECK_STRING_OR_BUFFER (object, 0); + CHECK_STRING_OR_BUFFER (object); if (BUFFERP (object)) { @@ -521,11 +534,11 @@ interval_of (position, object) DEFUN ("text-properties-at", Ftext_properties_at, Stext_properties_at, 1, 2, 0, - "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) + doc: /* Return the list of properties of the character at POSITION in OBJECT. +OBJECT is the string or buffer to look for the properties in; +nil means the current buffer. +If POSITION is at the end of OBJECT, the value is nil. */) + (position, object) Lisp_Object position, object; { register INTERVAL i; @@ -547,31 +560,36 @@ If POSITION is at the end of OBJECT, the value is nil.") } DEFUN ("get-text-property", Fget_text_property, Sget_text_property, 2, 3, 0, - "Return the value of POSITION'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.") - (position, prop, object) + doc: /* Return the value of POSITION's property PROP, in OBJECT. +OBJECT is optional and defaults to the current buffer. +If POSITION is at the end of OBJECT, the value is nil. */) + (position, prop, object) Lisp_Object position, object; Lisp_Object prop; { return textget (Ftext_properties_at (position, object), prop); } -DEFUN ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0, - "Return the value of POSITION'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.\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.") - (position, prop, object) +/* Return the value of POSITION's property PROP, in OBJECT. + OBJECT is optional and defaults to the current buffer. + If OVERLAY is non-0, then in the case that the returned property is from + an overlay, the overlay found is returned in *OVERLAY, otherwise nil is + returned in *OVERLAY. + If POSITION is at the end of OBJECT, the value is nil. + If OBJECT is a buffer, then overlay properties are considered as well as + text properties. + If OBJECT is a window, then that window's buffer is used, but + window-specific overlays are considered only if they are associated + with OBJECT. */ +Lisp_Object +get_char_property_and_overlay (position, prop, object, overlay) Lisp_Object position, object; register Lisp_Object prop; + Lisp_Object *overlay; { struct window *w = 0; - CHECK_NUMBER_COERCE_MARKER (position, 0); + CHECK_NUMBER_COERCE_MARKER (position); if (NILP (object)) XSETBUFFER (object, current_buffer); @@ -597,7 +615,7 @@ overlays are considered only if they are associated with OBJECT.") overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); noverlays = overlays_at (posn, 0, &overlay_vec, &len, - &next_overlay, NULL); + &next_overlay, NULL, 0); /* If there are more than 40, make enough space for all, and try again. */ @@ -606,7 +624,7 @@ overlays are considered only if they are associated with OBJECT.") len = noverlays; overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); noverlays = overlays_at (posn, 0, &overlay_vec, &len, - &next_overlay, NULL); + &next_overlay, NULL, 0); } noverlays = sort_overlays (overlay_vec, noverlays, w); @@ -617,25 +635,51 @@ overlays are considered only if they are associated with OBJECT.") { tem = Foverlay_get (overlay_vec[noverlays], prop); if (!NILP (tem)) - return (tem); + { + if (overlay) + /* Return the overlay we got the property from. */ + *overlay = overlay_vec[noverlays]; + return tem; + } } } + + if (overlay) + /* Indicate that the return value is not from an overlay. */ + *overlay = Qnil; + /* Not a buffer, or no appropriate overlay, so fall through to the simpler case. */ - return (Fget_text_property (position, prop, object)); + return Fget_text_property (position, prop, object); +} + +DEFUN ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0, + doc: /* Return the value of POSITION's property PROP, in OBJECT. +Both overlay properties and text properties are checked. +OBJECT is optional and defaults to the current buffer. +If POSITION is at the end of OBJECT, the value is nil. +If OBJECT is a buffer, then overlay properties are considered as well as +text properties. +If OBJECT is a window, then that window's buffer is used, but window-specific +overlays are considered only if they are associated with OBJECT. */) + (position, prop, object) + Lisp_Object position, object; + register Lisp_Object prop; +{ + return get_char_property_and_overlay (position, prop, object, 0); } 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) + doc: /* Return the position of next text property or overlay change. +This scans characters forward from POSITION till it finds a change in +some text property, or the beginning or end of an overlay, and returns +the position of that. +If none is found, the function returns (point-max). + +If the optional third argument LIMIT is non-nil, don't search +past position LIMIT; return LIMIT if nothing is found before LIMIT. */) + (position, limit) Lisp_Object position, limit; { Lisp_Object temp; @@ -643,7 +687,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") temp = Fnext_overlay_change (position); if (! NILP (limit)) { - CHECK_NUMBER (limit, 2); + CHECK_NUMBER (limit); if (XINT (limit) < XINT (temp)) temp = limit; } @@ -652,15 +696,15 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") 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) + doc: /* Return the position of previous text property or overlay change. +Scans characters backward from POSITION till it finds a change in some +text property, or the beginning or end of an overlay, and returns the +position of that. +If none is found, the function returns (point-max). + +If the optional third argument LIMIT is non-nil, don't search +past position LIMIT; return LIMIT if nothing is found before LIMIT. */) + (position, limit) Lisp_Object position, limit; { Lisp_Object temp; @@ -668,7 +712,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") temp = Fprevious_overlay_change (position); if (! NILP (limit)) { - CHECK_NUMBER (limit, 2); + CHECK_NUMBER (limit); if (XINT (limit) > XINT (temp)) temp = limit; } @@ -676,24 +720,29 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") } -/* Value is the position in OBJECT after POS where the value of - property PROP changes. OBJECT must be a string or buffer. If - OBJECT is nil, use the current buffer. LIMIT if not nil limits the - search. */ - -Lisp_Object -next_single_char_property_change (pos, prop, object, limit) - Lisp_Object prop, pos, object, limit; +DEFUN ("next-single-char-property-change", Fnext_single_char_property_change, + Snext_single_char_property_change, 2, 4, 0, + doc: /* Return the position of next text property or overlay change for a specific property. +Scans characters forward from POSITION till it finds +a change in the PROP property, then returns the position of the change. +The optional third argument OBJECT is the string or buffer to scan. +The property values are compared with `eq'. +If the property is constant all the way to the end of OBJECT, return the +last valid position in OBJECT. +If the optional fourth argument LIMIT is non-nil, don't search +past position LIMIT; return LIMIT if nothing is found before LIMIT. */) + (position, prop, object, limit) + Lisp_Object prop, position, object, limit; { if (STRINGP (object)) { - pos = Fnext_single_property_change (pos, prop, object, limit); - if (NILP (pos)) + position = Fnext_single_property_change (position, prop, object, limit); + if (NILP (position)) { if (NILP (limit)) - pos = make_number (XSTRING (object)->size); + position = make_number (XSTRING (object)->size); else - pos = limit; + position = limit; } } else @@ -701,8 +750,8 @@ next_single_char_property_change (pos, prop, object, limit) Lisp_Object initial_value, value; int count = specpdl_ptr - specpdl; - if (!NILP (object)) - CHECK_BUFFER (object, 0); + if (! NILP (object)) + CHECK_BUFFER (object); if (BUFFERP (object) && current_buffer != XBUFFER (object)) { @@ -710,12 +759,22 @@ next_single_char_property_change (pos, prop, object, limit) Fset_buffer (object); } - initial_value = Fget_char_property (pos, prop, object); + initial_value = Fget_char_property (position, prop, object); - while (XFASTINT (pos) < XFASTINT (limit)) + if (NILP (limit)) + XSETFASTINT (limit, BUF_ZV (current_buffer)); + else + CHECK_NUMBER_COERCE_MARKER (limit); + + for (;;) { - pos = Fnext_char_property_change (pos, limit); - value = Fget_char_property (pos, prop, object); + 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; } @@ -723,22 +782,100 @@ next_single_char_property_change (pos, prop, object, limit) unbind_to (count, Qnil); } - return pos; + return position; } +DEFUN ("previous-single-char-property-change", + Fprevious_single_char_property_change, + Sprevious_single_char_property_change, 2, 4, 0, + doc: /* Return the position of previous text property or overlay change for a specific property. +Scans characters backward from POSITION till it finds +a change in the PROP property, then returns the position of the change. +The optional third argument OBJECT is the string or buffer to scan. +The property values are compared with `eq'. +If the property is constant all the way to the start of OBJECT, return the +first valid position in OBJECT. +If the optional fourth argument LIMIT is non-nil, don't search +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); + + 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); + + if (XFASTINT (position) <= XFASTINT (limit)) + position = limit; + else + { + Lisp_Object initial_value = + Fget_char_property (make_number (XFASTINT (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 (make_number (XFASTINT (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\ -Scans characters forward from POSITION 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 POSITION, 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.") - (position, object, limit) + doc: /* Return the position of next property change. +Scans characters forward from POSITION in OBJECT till it finds +a change in some text property, then returns the position of the change. +The optional second argument OBJECT is the string or buffer to scan. +Return nil if the property is constant all the way to the end of OBJECT. +If the value is non-nil, it is a position greater than POSITION, never equal. + +If the optional third argument LIMIT is non-nil, don't search +past position LIMIT; return LIMIT if nothing is found before LIMIT. */) + (position, object, limit) Lisp_Object position, object, limit; { register INTERVAL i, next; @@ -747,7 +884,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") XSETBUFFER (object, current_buffer); if (! NILP (limit) && ! EQ (limit, Qt)) - CHECK_NUMBER_COERCE_MARKER (limit, 0); + CHECK_NUMBER_COERCE_MARKER (limit); i = validate_interval_range (object, &position, &position, soft); @@ -821,16 +958,17 @@ property_change_between_p (beg, end) DEFUN ("next-single-property-change", Fnext_single_property_change, Snext_single_property_change, 2, 4, 0, - "Return the position of next property 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) + doc: /* Return the position of next property change for a specific property. +Scans characters forward from POSITION till it finds +a change in the PROP property, then returns the position of the change. +The optional third argument OBJECT is the string or buffer to scan. +The property values are compared with `eq'. +Return nil if the property is constant all the way to the end of OBJECT. +If the value is non-nil, it is a position greater than POSITION, never equal. + +If the optional fourth argument LIMIT is non-nil, don't search +past position LIMIT; return LIMIT if nothing is found before LIMIT. */) + (position, prop, object, limit) Lisp_Object position, prop, object, limit; { register INTERVAL i, next; @@ -840,7 +978,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") XSETBUFFER (object, current_buffer); if (!NILP (limit)) - CHECK_NUMBER_COERCE_MARKER (limit, 0); + CHECK_NUMBER_COERCE_MARKER (limit); i = validate_interval_range (object, &position, &position, soft); if (NULL_INTERVAL_P (i)) @@ -863,15 +1001,16 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") DEFUN ("previous-property-change", Fprevious_property_change, Sprevious_property_change, 1, 3, 0, - "Return the position of previous property change.\n\ -Scans characters backwards from POSITION 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 POSITION, 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.") - (position, object, limit) + doc: /* Return the position of previous property change. +Scans characters backwards from POSITION in OBJECT till it finds +a change in some text property, then returns the position of the change. +The optional second argument OBJECT is the string or buffer to scan. +Return nil if the property is constant all the way to the start of OBJECT. +If the value is non-nil, it is a position less than POSITION, never equal. + +If the optional third argument LIMIT is non-nil, don't search +back past position LIMIT; return LIMIT if nothing is found until LIMIT. */) + (position, object, limit) Lisp_Object position, object, limit; { register INTERVAL i, previous; @@ -880,7 +1019,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") XSETBUFFER (object, current_buffer); if (!NILP (limit)) - CHECK_NUMBER_COERCE_MARKER (limit, 0); + CHECK_NUMBER_COERCE_MARKER (limit); i = validate_interval_range (object, &position, &position, soft); if (NULL_INTERVAL_P (i)) @@ -906,15 +1045,16 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") DEFUN ("previous-single-property-change", Fprevious_single_property_change, Sprevious_single_property_change, 2, 4, 0, - "Return the position of previous property 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 until LIMIT.") + doc: /* Return the position of previous property change for a specific property. +Scans characters backward from POSITION till it finds +a change in the PROP property, then returns the position of the change. +The optional third argument OBJECT is the string or buffer to scan. +The property values are compared with `eq'. +Return nil if the property is constant all the way to the start of OBJECT. +If the value is non-nil, it is a position less than POSITION, never equal. + +If the optional fourth argument LIMIT is non-nil, don't search +back past position LIMIT; return LIMIT if nothing is found until LIMIT. */) (position, prop, object, limit) Lisp_Object position, prop, object, limit; { @@ -925,7 +1065,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") XSETBUFFER (object, current_buffer); if (!NILP (limit)) - CHECK_NUMBER_COERCE_MARKER (limit, 0); + CHECK_NUMBER_COERCE_MARKER (limit); i = validate_interval_range (object, &position, &position, soft); @@ -956,13 +1096,13 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") DEFUN ("add-text-properties", Fadd_text_properties, Sadd_text_properties, 3, 4, 0, - "Add properties to the text from START to END.\n\ -The third argument PROPERTIES is a property list\n\ -specifying the property values to add.\n\ -The optional fourth argument, OBJECT,\n\ -is the string or buffer containing the text.\n\ -Return t if any property value actually changed, nil otherwise.") - (start, end, properties, object) + doc: /* Add properties to the text from START to END. +The third argument PROPERTIES is a property list +specifying the property values to add. +The optional fourth argument, OBJECT, +is the string or buffer containing the text. +Return t if any property value actually changed, nil otherwise. */) + (start, end, properties, object) Lisp_Object start, end, properties, object; { register INTERVAL i, unchanged; @@ -1064,12 +1204,12 @@ Return t if any property value actually changed, nil otherwise.") DEFUN ("put-text-property", Fput_text_property, Sput_text_property, 4, 5, 0, - "Set one property of the text from START to END.\n\ -The third and fourth arguments PROPERTY and VALUE\n\ -specify the property to add.\n\ -The optional fifth argument, OBJECT,\n\ -is the string or buffer containing the text.") - (start, end, property, value, object) + doc: /* Set one property of the text from START to END. +The third and fourth arguments PROPERTY and VALUE +specify the property to add. +The optional fifth argument, OBJECT, +is the string or buffer containing the text. */) + (start, end, property, value, object) Lisp_Object start, end, property, value, object; { Fadd_text_properties (start, end, @@ -1080,11 +1220,14 @@ is the string or buffer containing the text.") DEFUN ("set-text-properties", Fset_text_properties, Sset_text_properties, 3, 4, 0, - "Completely replace properties of text from START to END.\n\ -The third argument PROPERTIES is the new property list.\n\ -The optional fourth argument, OBJECT,\n\ -is the string or buffer containing the text.") - (start, end, properties, object) + doc: /* Completely replace properties of text from START to END. +The third argument PROPERTIES is the new property list. +The optional fourth argument, OBJECT, +is the string or buffer containing the text. +If OBJECT is omitted or nil, it defaults to the current buffer. +If PROPERTIES is nil, the effect is to remove all properties from +the designated part of OBJECT. */) + (start, end, properties, object) Lisp_Object start, end, properties, object; { return set_text_properties (start, end, properties, object, Qt); @@ -1102,9 +1245,7 @@ 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; + register INTERVAL i; Lisp_Object ostart, oend; ostart = start; @@ -1147,11 +1288,45 @@ set_text_properties (start, end, properties, object, signal_after_change_p) return Qnil; } + if (BUFFERP (object)) + modify_region (XBUFFER (object), XINT (start), XINT (end)); + + set_text_properties_1 (start, end, properties, object, i); + + if (BUFFERP (object) && !NILP (signal_after_change_p)) + signal_after_change (XINT (start), XINT (end) - XINT (start), + XINT (end) - XINT (start)); + return Qt; +} + +/* Replace properties of text from START to END with new list of + properties PROPERTIES. BUFFER is the buffer containing + the text. This does not obey any hooks. + You can provide the interval that START is located in as I, + or pass NULL for I and this function will find it. + START and END can be in any order. */ + +void +set_text_properties_1 (start, end, properties, buffer, i) + Lisp_Object start, end, properties, buffer; + INTERVAL i; +{ + register INTERVAL prev_changed = NULL_INTERVAL; + register int s, len; + INTERVAL unchanged; + s = XINT (start); len = XINT (end) - s; + if (len == 0) + return; + if (len < 0) + { + s = s + len; + len = - len; + } - if (BUFFERP (object)) - modify_region (XBUFFER (object), XINT (start), XINT (end)); + if (i == 0) + i = find_interval (BUF_INTERVALS (XBUFFER (buffer)), s); if (i->position != s) { @@ -1162,24 +1337,14 @@ set_text_properties (start, end, properties, object, signal_after_change_p) { copy_properties (unchanged, i); i = split_interval_left (i, len); - set_properties (properties, i, object); - if (BUFFERP (object) && !NILP (signal_after_change_p)) - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); - - return Qt; + set_properties (properties, i, buffer); + return; } - set_properties (properties, i, object); + set_properties (properties, i, buffer); if (LENGTH (i) == len) - { - if (BUFFERP (object) && !NILP (signal_after_change_p)) - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); - - return Qt; - } + return; prev_changed = i; len -= LENGTH (i); @@ -1200,13 +1365,10 @@ set_text_properties (start, end, properties, object, signal_after_change_p) /* We have to call set_properties even if we are going to merge the intervals, so as to make the undo records and cause redisplay to happen. */ - set_properties (properties, i, object); + set_properties (properties, i, buffer); if (!NULL_INTERVAL_P (prev_changed)) merge_interval_left (i); - if (BUFFERP (object) && !NILP (signal_after_change_p)) - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); - return Qt; + return; } len -= LENGTH (i); @@ -1214,7 +1376,7 @@ set_text_properties (start, end, properties, object, signal_after_change_p) /* We have to call set_properties even if we are going to merge the intervals, so as to make the undo records and cause redisplay to happen. */ - set_properties (properties, i, object); + set_properties (properties, i, buffer); if (NULL_INTERVAL_P (prev_changed)) prev_changed = i; else @@ -1222,23 +1384,18 @@ set_text_properties (start, end, properties, object, signal_after_change_p) i = next_interval (i); } - - if (BUFFERP (object) && !NILP (signal_after_change_p)) - signal_after_change (XINT (start), XINT (end) - XINT (start), - XINT (end) - XINT (start)); - return Qt; } DEFUN ("remove-text-properties", Fremove_text_properties, Sremove_text_properties, 3, 4, 0, - "Remove some properties from text from START to END.\n\ -The third argument PROPERTIES is a property list\n\ -whose property names specify the properties to remove.\n\ -\(The values stored in PROPERTIES are ignored.)\n\ -The optional fourth argument, OBJECT,\n\ -is the string or buffer containing the text.\n\ -Return t if any property was actually removed, nil otherwise.") - (start, end, properties, object) + doc: /* Remove some properties from text from START to END. +The third argument PROPERTIES is a property list +whose property names specify the properties to remove. +\(The values stored in PROPERTIES are ignored.) +The optional fourth argument, OBJECT, +is the string or buffer containing the text. +Return t if any property was actually removed, nil otherwise. */) + (start, end, properties, object) Lisp_Object start, end, properties, object; { register INTERVAL i, unchanged; @@ -1318,13 +1475,13 @@ Return t if any property was actually removed, nil otherwise.") 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\ -If so, return the position of the first character whose property PROPERTY\n\ -is `eq' to VALUE. Otherwise return nil.\n\ -The optional fifth argument, OBJECT, is the string or buffer\n\ -containing the text.") - (start, end, property, value, object) - Lisp_Object start, end, property, value, object; + doc: /* Check text from START to END for property PROPERTY equalling VALUE. +If so, return the position of the first character whose property PROPERTY +is `eq' to VALUE. Otherwise return nil. +The optional fifth argument, OBJECT, is the string or buffer +containing the text. */) + (start, end, property, value, object) + Lisp_Object start, end, property, value, object; { register INTERVAL i; register int e, pos; @@ -1354,13 +1511,13 @@ containing the text.") DEFUN ("text-property-not-all", Ftext_property_not_all, Stext_property_not_all, 4, 5, 0, - "Check text from START to END for property PROPERTY not equalling VALUE.\n\ -If so, return the position of the first character whose property PROPERTY\n\ -is not `eq' to VALUE. Otherwise, return nil.\n\ -The optional fifth argument, OBJECT, is the string or buffer\n\ -containing the text.") - (start, end, property, value, object) - Lisp_Object start, end, property, value, object; + doc: /* Check text from START to END for property PROPERTY not equalling VALUE. +If so, return the position of the first character whose property PROPERTY +is not `eq' to VALUE. Otherwise, return nil. +The optional fifth argument, OBJECT, is the string or buffer +containing the text. */) + (start, end, property, value, object) + Lisp_Object start, end, property, value, object; { register INTERVAL i; register int s, e; @@ -1419,7 +1576,7 @@ copy_text_properties (start, end, src, pos, dest, prop) if (NULL_INTERVAL_P (i)) return Qnil; - CHECK_NUMBER_COERCE_MARKER (pos, 0); + CHECK_NUMBER_COERCE_MARKER (pos); { Lisp_Object dest_start, dest_end; @@ -1600,7 +1757,7 @@ extend_property_ranges (list, old_end, new_end) end = XCAR (XCDR (item)); if (EQ (end, old_end)) - XCAR (XCDR (item)) = new_end; + XSETCAR (XCDR (item), new_end); } } @@ -1662,7 +1819,7 @@ verify_interval_modification (buf, start, end) /* For an insert operation, check the two chars around the position. */ if (start == end) { - INTERVAL prev; + INTERVAL prev = NULL; Lisp_Object before, after; /* Set I to the interval containing the char after START, @@ -1706,7 +1863,7 @@ verify_interval_modification (buf, start, end) if (TMEM (Qread_only, tem) || (NILP (Fplist_get (i->plist, Qread_only)) && TMEM (Qcategory, tem))) - Fsignal (Qtext_read_only, Qnil); + text_read_only (); } } @@ -1726,7 +1883,7 @@ verify_interval_modification (buf, start, end) if (! TMEM (Qread_only, tem) && (! NILP (Fplist_get (prev->plist,Qread_only)) || ! TMEM (Qcategory, tem))) - Fsignal (Qtext_read_only, Qnil); + text_read_only (); } } } @@ -1745,13 +1902,13 @@ verify_interval_modification (buf, start, end) if (TMEM (Qread_only, tem) || (NILP (Fplist_get (i->plist, Qread_only)) && TMEM (Qcategory, tem))) - Fsignal (Qtext_read_only, Qnil); + text_read_only (); tem = textget (prev->plist, Qrear_nonsticky); if (! TMEM (Qread_only, tem) && (! NILP (Fplist_get (prev->plist, Qread_only)) || ! TMEM (Qcategory, tem))) - Fsignal (Qtext_read_only, Qnil); + text_read_only (); } } } @@ -1773,13 +1930,16 @@ verify_interval_modification (buf, start, end) do { if (! INTERVAL_WRITABLE_P (i)) - Fsignal (Qtext_read_only, Qnil); + text_read_only (); - mod_hooks = textget (i->plist, Qmodification_hooks); - if (! NILP (mod_hooks) && ! EQ (mod_hooks, prev_mod_hooks)) + if (!inhibit_modification_hooks) { - hooks = Fcons (mod_hooks, hooks); - prev_mod_hooks = mod_hooks; + mod_hooks = textget (i->plist, Qmodification_hooks); + if (! NILP (mod_hooks) && ! EQ (mod_hooks, prev_mod_hooks)) + { + hooks = Fcons (mod_hooks, hooks); + prev_mod_hooks = mod_hooks; + } } i = next_interval (i); @@ -1787,15 +1947,18 @@ verify_interval_modification (buf, start, end) /* Keep going thru the interval containing the char before END. */ while (! NULL_INTERVAL_P (i) && i->position < end); - GCPRO1 (hooks); - hooks = Fnreverse (hooks); - while (! EQ (hooks, Qnil)) + if (!inhibit_modification_hooks) { - call_mod_hooks (Fcar (hooks), make_number (start), - make_number (end)); - hooks = Fcdr (hooks); + GCPRO1 (hooks); + hooks = Fnreverse (hooks); + while (! EQ (hooks, Qnil)) + { + call_mod_hooks (Fcar (hooks), make_number (start), + make_number (end)); + hooks = Fcdr (hooks); + } + UNGCPRO; } - UNGCPRO; } } @@ -1820,25 +1983,25 @@ void syms_of_textprop () { DEFVAR_LISP ("default-text-properties", &Vdefault_text_properties, - "Property-list used as default values.\n\ -The value of a property in this list is seen as the value for every\n\ -character that does not have its own value for that property."); + doc: /* Property-list used as default values. +The value of a property in this list is seen as the value for every +character that does not have its own value for that property. */); Vdefault_text_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."); + doc: /* If non-nil, don't run `point-left' and `point-entered' text properties. +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."); + doc: /* Alist of properties vs the corresponding non-stickinesses. +Each element has the form (PROPERTY . NONSTICKINESS). + +If a character in a buffer has PROPERTY, new text inserted adjacent to +the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil, +inherits it if NONSTICKINESS is nil. The front-sticky and +rear-nonsticky properties of the character overrides NONSTICKINESS. */); Vtext_property_default_nonsticky = Qnil; staticpro (&interval_insert_behind_hooks); @@ -1892,6 +2055,8 @@ rear-nonsticky properties of the character overrides NONSTICKINESS."); 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);