Mercurial > emacs

diff src/intervals.h @ 106780:85fd976607be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bounds checking for text properties in `format' (Bug#5306). * intervals.h, textprop.c (extend_property_ranges): Return value and args changed. Discard properties that begin at or after the new end (Bug#5306). * editfns.c (Fformat): Caller changed.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 09 Jan 2010 17:32:47 -0500
parents e038c1a8307c
children 1d1d5d9bd884
line wrap: on
line diff
--- a/src/intervals.h	Sat Jan 09 16:14:50 2010 -0500
+++ b/src/intervals.h	Sat Jan 09 17:32:47 2010 -0500
@@ -335,7 +335,7 @@
 Lisp_Object text_property_list P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
 				    Lisp_Object));
 int add_text_properties_from_list P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
-void extend_property_ranges P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
+Lisp_Object extend_property_ranges P_ ((Lisp_Object, Lisp_Object));
 Lisp_Object get_char_property_and_overlay P_ ((Lisp_Object, Lisp_Object,
 					       Lisp_Object, Lisp_Object*));
 extern int text_property_stickiness P_ ((Lisp_Object prop, Lisp_Object pos,