aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/textprop.c32
2 files changed, 2 insertions, 32 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 21475dd6a6a..65b7bccd79e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-03-18 Paul Eggert <eggert@cs.ucla.edu> 12011-03-18 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * textprop.c (property_change_between_p): Remove; unused.
4
3 * intervals.c (interval_start_pos): Now static. 5 * intervals.c (interval_start_pos): Now static.
4 6
5 * intervals.h (CHECK_TOTAL_LENGTH): Avoid empty "else". 7 * intervals.h (CHECK_TOTAL_LENGTH): Avoid empty "else".
diff --git a/src/textprop.c b/src/textprop.c
index 5db6033670b..cd89efeb38d 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -974,37 +974,6 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */)
974 return make_number (next->position); 974 return make_number (next->position);
975} 975}
976 976
977/* Return 1 if there's a change in some property between BEG and END. */
978
979int
980property_change_between_p (EMACS_INT beg, EMACS_INT end)
981{
982 register INTERVAL i, next;
983 Lisp_Object object, pos;
984
985 XSETBUFFER (object, current_buffer);
986 XSETFASTINT (pos, beg);
987
988 i = validate_interval_range (object, &pos, &pos, soft);
989 if (NULL_INTERVAL_P (i))
990 return 0;
991
992 next = next_interval (i);
993 while (! NULL_INTERVAL_P (next) && intervals_equal (i, next))
994 {
995 next = next_interval (next);
996 if (NULL_INTERVAL_P (next))
997 return 0;
998 if (next->position >= end)
999 return 0;
1000 }
1001
1002 if (NULL_INTERVAL_P (next))
1003 return 0;
1004
1005 return 1;
1006}
1007
1008DEFUN ("next-single-property-change", Fnext_single_property_change, 977DEFUN ("next-single-property-change", Fnext_single_property_change,
1009 Snext_single_property_change, 2, 4, 0, 978 Snext_single_property_change, 2, 4, 0,
1010 doc: /* Return the position of next property change for a specific property. 979 doc: /* Return the position of next property change for a specific property.
@@ -2331,4 +2300,3 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and
2331/* defsubr (&Serase_text_properties); */ 2300/* defsubr (&Serase_text_properties); */
2332/* defsubr (&Scopy_text_properties); */ 2301/* defsubr (&Scopy_text_properties); */
2333} 2302}
2334