diff options
| author | Karl Heuer | 1994-10-04 12:27:29 +0000 |
|---|---|---|
| committer | Karl Heuer | 1994-10-04 12:27:29 +0000 |
| commit | c8a4fc3d27dcf7022b77e8e974e14e44edb7db79 (patch) | |
| tree | dbc70b391a42b0e580914f010483054cefbb7467 | |
| parent | c81d47b43d58fe58fa3f22718932e67ccc3d9892 (diff) | |
| download | emacs-c8a4fc3d27dcf7022b77e8e974e14e44edb7db79.tar.gz emacs-c8a4fc3d27dcf7022b77e8e974e14e44edb7db79.zip | |
(Ftext_properties_at, Fget_char_property, Fnext_property_change,
property_change_between_p, Fnext_single_property_change,
Fprevious_property_change, Fprevious_single_property_change,
Fadd_text_properties, Fset_text_properties, Fremove_text_properties,
Ftext_property_any, Ftext_property_not_all, Ferase_text_properties): Use new
accessor macros instead of calling XSET directly.
| -rw-r--r-- | src/textprop.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/textprop.c b/src/textprop.c index 666ca9c868d..6f8cb7e39de 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -485,7 +485,7 @@ If POSITION is at the end of OBJECT, the value is nil.") | |||
| 485 | register INTERVAL i; | 485 | register INTERVAL i; |
| 486 | 486 | ||
| 487 | if (NILP (object)) | 487 | if (NILP (object)) |
| 488 | XSET (object, Lisp_Buffer, current_buffer); | 488 | XSETBUFFER (object, current_buffer); |
| 489 | 489 | ||
| 490 | i = validate_interval_range (object, &pos, &pos, soft); | 490 | i = validate_interval_range (object, &pos, &pos, soft); |
| 491 | if (NULL_INTERVAL_P (i)) | 491 | if (NULL_INTERVAL_P (i)) |
| @@ -528,7 +528,7 @@ overlays are considered only if they are associated with OBJECT.") | |||
| 528 | CHECK_NUMBER_COERCE_MARKER (pos, 0); | 528 | CHECK_NUMBER_COERCE_MARKER (pos, 0); |
| 529 | 529 | ||
| 530 | if (NILP (object)) | 530 | if (NILP (object)) |
| 531 | XSET (object, Lisp_Buffer, current_buffer); | 531 | XSETBUFFER (object, current_buffer); |
| 532 | 532 | ||
| 533 | if (WINDOWP (object)) | 533 | if (WINDOWP (object)) |
| 534 | { | 534 | { |
| @@ -590,7 +590,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") | |||
| 590 | register INTERVAL i, next; | 590 | register INTERVAL i, next; |
| 591 | 591 | ||
| 592 | if (NILP (object)) | 592 | if (NILP (object)) |
| 593 | XSET (object, Lisp_Buffer, current_buffer); | 593 | XSETBUFFER (object, current_buffer); |
| 594 | 594 | ||
| 595 | if (!NILP (limit)) | 595 | if (!NILP (limit)) |
| 596 | CHECK_NUMBER_COERCE_MARKER (limit, 0); | 596 | CHECK_NUMBER_COERCE_MARKER (limit, 0); |
| @@ -622,7 +622,7 @@ property_change_between_p (beg, end) | |||
| 622 | register INTERVAL i, next; | 622 | register INTERVAL i, next; |
| 623 | Lisp_Object object, pos; | 623 | Lisp_Object object, pos; |
| 624 | 624 | ||
| 625 | XSET (object, Lisp_Buffer, current_buffer); | 625 | XSETBUFFER (object, current_buffer); |
| 626 | XFASTINT (pos) = beg; | 626 | XFASTINT (pos) = beg; |
| 627 | 627 | ||
| 628 | i = validate_interval_range (object, &pos, &pos, soft); | 628 | i = validate_interval_range (object, &pos, &pos, soft); |
| @@ -663,7 +663,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.") | |||
| 663 | register Lisp_Object here_val; | 663 | register Lisp_Object here_val; |
| 664 | 664 | ||
| 665 | if (NILP (object)) | 665 | if (NILP (object)) |
| 666 | XSET (object, Lisp_Buffer, current_buffer); | 666 | XSETBUFFER (object, current_buffer); |
| 667 | 667 | ||
| 668 | if (!NILP (limit)) | 668 | if (!NILP (limit)) |
| 669 | CHECK_NUMBER_COERCE_MARKER (limit, 0); | 669 | CHECK_NUMBER_COERCE_MARKER (limit, 0); |
| @@ -704,7 +704,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") | |||
| 704 | register INTERVAL i, previous; | 704 | register INTERVAL i, previous; |
| 705 | 705 | ||
| 706 | if (NILP (object)) | 706 | if (NILP (object)) |
| 707 | XSET (object, Lisp_Buffer, current_buffer); | 707 | XSETBUFFER (object, current_buffer); |
| 708 | 708 | ||
| 709 | if (!NILP (limit)) | 709 | if (!NILP (limit)) |
| 710 | CHECK_NUMBER_COERCE_MARKER (limit, 0); | 710 | CHECK_NUMBER_COERCE_MARKER (limit, 0); |
| @@ -751,7 +751,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.") | |||
| 751 | register Lisp_Object here_val; | 751 | register Lisp_Object here_val; |
| 752 | 752 | ||
| 753 | if (NILP (object)) | 753 | if (NILP (object)) |
| 754 | XSET (object, Lisp_Buffer, current_buffer); | 754 | XSETBUFFER (object, current_buffer); |
| 755 | 755 | ||
| 756 | if (!NILP (limit)) | 756 | if (!NILP (limit)) |
| 757 | CHECK_NUMBER_COERCE_MARKER (limit, 0); | 757 | CHECK_NUMBER_COERCE_MARKER (limit, 0); |
| @@ -802,7 +802,7 @@ Return t if any property value actually changed, nil otherwise.") | |||
| 802 | return Qnil; | 802 | return Qnil; |
| 803 | 803 | ||
| 804 | if (NILP (object)) | 804 | if (NILP (object)) |
| 805 | XSET (object, Lisp_Buffer, current_buffer); | 805 | XSETBUFFER (object, current_buffer); |
| 806 | 806 | ||
| 807 | i = validate_interval_range (object, &start, &end, hard); | 807 | i = validate_interval_range (object, &start, &end, hard); |
| 808 | if (NULL_INTERVAL_P (i)) | 808 | if (NULL_INTERVAL_P (i)) |
| @@ -900,7 +900,7 @@ is the string or buffer containing the text.") | |||
| 900 | props = validate_plist (props); | 900 | props = validate_plist (props); |
| 901 | 901 | ||
| 902 | if (NILP (object)) | 902 | if (NILP (object)) |
| 903 | XSET (object, Lisp_Buffer, current_buffer); | 903 | XSETBUFFER (object, current_buffer); |
| 904 | 904 | ||
| 905 | i = validate_interval_range (object, &start, &end, soft); | 905 | i = validate_interval_range (object, &start, &end, soft); |
| 906 | if (NULL_INTERVAL_P (i)) | 906 | if (NULL_INTERVAL_P (i)) |
| @@ -995,7 +995,7 @@ Return t if any property was actually removed, nil otherwise.") | |||
| 995 | register int s, len, modified = 0; | 995 | register int s, len, modified = 0; |
| 996 | 996 | ||
| 997 | if (NILP (object)) | 997 | if (NILP (object)) |
| 998 | XSET (object, Lisp_Buffer, current_buffer); | 998 | XSETBUFFER (object, current_buffer); |
| 999 | 999 | ||
| 1000 | i = validate_interval_range (object, &start, &end, soft); | 1000 | i = validate_interval_range (object, &start, &end, soft); |
| 1001 | if (NULL_INTERVAL_P (i)) | 1001 | if (NULL_INTERVAL_P (i)) |
| @@ -1071,7 +1071,7 @@ containing the text.") | |||
| 1071 | register int e, pos; | 1071 | register int e, pos; |
| 1072 | 1072 | ||
| 1073 | if (NILP (object)) | 1073 | if (NILP (object)) |
| 1074 | XSET (object, Lisp_Buffer, current_buffer); | 1074 | XSETBUFFER (object, current_buffer); |
| 1075 | i = validate_interval_range (object, &start, &end, soft); | 1075 | i = validate_interval_range (object, &start, &end, soft); |
| 1076 | e = XINT (end); | 1076 | e = XINT (end); |
| 1077 | 1077 | ||
| @@ -1105,7 +1105,7 @@ containing the text.") | |||
| 1105 | register int s, e; | 1105 | register int s, e; |
| 1106 | 1106 | ||
| 1107 | if (NILP (object)) | 1107 | if (NILP (object)) |
| 1108 | XSET (object, Lisp_Buffer, current_buffer); | 1108 | XSETBUFFER (object, current_buffer); |
| 1109 | i = validate_interval_range (object, &start, &end, soft); | 1109 | i = validate_interval_range (object, &start, &end, soft); |
| 1110 | if (NULL_INTERVAL_P (i)) | 1110 | if (NULL_INTERVAL_P (i)) |
| 1111 | return (NILP (value) || EQ (start, end)) ? Qnil : start; | 1111 | return (NILP (value) || EQ (start, end)) ? Qnil : start; |
| @@ -1142,7 +1142,7 @@ is the string or buffer containing the text.") | |||
| 1142 | register int s, len, modified; | 1142 | register int s, len, modified; |
| 1143 | 1143 | ||
| 1144 | if (NILP (object)) | 1144 | if (NILP (object)) |
| 1145 | XSET (object, Lisp_Buffer, current_buffer); | 1145 | XSETBUFFER (object, current_buffer); |
| 1146 | 1146 | ||
| 1147 | i = validate_interval_range (object, &start, &end, soft); | 1147 | i = validate_interval_range (object, &start, &end, soft); |
| 1148 | if (NULL_INTERVAL_P (i)) | 1148 | if (NULL_INTERVAL_P (i)) |