diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-07-08 22:34:34 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-07-08 22:34:34 +0300 |
| commit | d8a9c450cf4c575d21297885d6823920aec0482f (patch) | |
| tree | 35d2299a4dd5779e6c5afe2ed849c4942480c902 /src/intervals.h | |
| parent | d0c0b71d889ff223d2e5073b733f4047d541343b (diff) | |
| download | emacs-d8a9c450cf4c575d21297885d6823920aec0482f.tar.gz | |
Yet another fix for copying properties by 'format'
* src/textprop.c (extend_property_ranges): Accept an additional
argument OLD_END, and only extend the end of a property range if
its original end is at OLD_END; all the other ranges are left
intact. (Bug#23897)
* src/editfns.c (styled_format): Pass the original length of the
string to 'extend_property_ranges'.
* src/intervals.h (extend_property_ranges): Adjust prototype.
* test/src/editfns-tests.el (format-properties): Add tests for
bug#23897.
Diffstat (limited to 'src/intervals.h')
| -rw-r--r-- | src/intervals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intervals.h b/src/intervals.h index 6a5a4129abc..9a38d849b88 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -285,7 +285,7 @@ extern void set_text_properties_1 (Lisp_Object, Lisp_Object, Lisp_Object text_property_list (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); void add_text_properties_from_list (Lisp_Object, Lisp_Object, Lisp_Object); -Lisp_Object extend_property_ranges (Lisp_Object, Lisp_Object); +Lisp_Object extend_property_ranges (Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object get_char_property_and_overlay (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object*); extern int text_property_stickiness (Lisp_Object prop, Lisp_Object pos, |