X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9dd7eec678ffac9edb405660252b158b4f1451f6..d4225c08140da5c1d7a73de98245ad9fc49a1b81:/src/textprop.c diff --git a/src/textprop.c b/src/textprop.c index c938fb441b..a14480bf29 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, 1997 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -46,8 +46,6 @@ Boston, MA 02111-1307, USA. */ necessary for the system to remain consistent. This requirement 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. */ Lisp_Object Qmouse_left; @@ -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. */ @@ -203,7 +202,7 @@ 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. */ @@ -268,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; } @@ -293,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); } @@ -306,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); } } @@ -675,6 +674,151 @@ past position LIMIT; return LIMIT if nothing is found before 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 (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, @@ -1034,12 +1178,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; @@ -1097,7 +1255,7 @@ is the string or buffer containing the text.") copy_properties (unchanged, i); i = split_interval_left (i, len); set_properties (properties, i, object); - if (BUFFERP (object)) + if (BUFFERP (object) && !NILP (signal_after_change_p)) signal_after_change (XINT (start), XINT (end) - XINT (start), XINT (end) - XINT (start)); @@ -1108,7 +1266,7 @@ is the string or buffer containing the text.") if (LENGTH (i) == len) { - if (BUFFERP (object)) + if (BUFFERP (object) && !NILP (signal_after_change_p)) signal_after_change (XINT (start), XINT (end) - XINT (start), XINT (end) - XINT (start)); @@ -1137,7 +1295,7 @@ is the string or buffer containing the text.") set_properties (properties, i, object); if (!NULL_INTERVAL_P (prev_changed)) merge_interval_left (i); - if (BUFFERP (object)) + if (BUFFERP (object) && !NILP (signal_after_change_p)) signal_after_change (XINT (start), XINT (end) - XINT (start), XINT (end) - XINT (start)); return Qt; @@ -1157,7 +1315,7 @@ is the string or buffer containing the text.") i = next_interval (i); } - if (BUFFERP (object)) + if (BUFFERP (object) && !NILP (signal_after_change_p)) signal_after_change (XINT (start), XINT (end) - XINT (start), XINT (end) - XINT (start)); return Qt; @@ -1437,7 +1595,6 @@ text_property_list (object, start, end, prop) { struct interval *i; Lisp_Object result; - int s, e; result = Qnil; @@ -1535,7 +1692,7 @@ extend_property_ranges (list, old_end, new_end) end = XCAR (XCDR (item)); if (EQ (end, old_end)) - XCONS (XCDR (item))->car = new_end; + XCAR (XCDR (item)) = new_end; } } @@ -1571,7 +1728,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; @@ -1641,7 +1798,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); } } @@ -1661,7 +1818,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); } } } @@ -1680,13 +1837,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); } } } @@ -1708,7 +1865,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)) @@ -1765,6 +1922,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; @@ -1816,6 +1984,8 @@ This also inhibits the use of the `intangible' 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); @@ -1830,8 +2000,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 */