diff options
author | Alan Mackenzie <[email protected]> | 2010-01-19 13:16:01 +0000 |
---|---|---|
committer | Alan Mackenzie <[email protected]> | 2010-01-19 13:16:01 +0000 |
commit | eeff0f485929b225f9b302e5957a654f4a367305 (patch) | |
tree | 70e1ae44122fd519098768f1e4982339492b4f2c /src/textprop.c | |
parent | 6a47c86a180882432ea34fcb0f7da8f4c27dd61e (diff) | |
parent | f7247f5dfc26110d131b59158eb5dfa8de0d6f6e (diff) |
Suppress spurious second invocation of before-change-functions
Diffstat (limited to 'src/textprop.c')
-rw-r--r-- | src/textprop.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/textprop.c b/src/textprop.c index fee73321de..83d09cce55 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1346,13 +1346,15 @@ the designated part of OBJECT. */) /* 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 nil if the function _detected_ that it did not replace any - properties, non-nil otherwise. */ + COHERENT_CHANGE_P nil means this is being called as an internal + subroutine, rather than as a change primitive with checking of + read-only, invoking change hooks, etc.. Value is nil if the + function _detected_ that it did not replace any properties, non-nil + otherwise. */ Lisp_Object -set_text_properties (start, end, properties, object, signal_after_change_p) - Lisp_Object start, end, properties, object, signal_after_change_p; +set_text_properties (start, end, properties, object, coherent_change_p) + Lisp_Object start, end, properties, object, coherent_change_p; { register INTERVAL i; Lisp_Object ostart, oend; @@ -1397,12 +1399,12 @@ set_text_properties (start, end, properties, object, signal_after_change_p) return Qnil; } - if (BUFFERP (object)) + if (BUFFERP (object) && !NILP (coherent_change_p)) modify_region (XBUFFER (object), XINT (start), XINT (end), 1); set_text_properties_1 (start, end, properties, object, i); - if (BUFFERP (object) && !NILP (signal_after_change_p)) + if (BUFFERP (object) && !NILP (coherent_change_p)) signal_after_change (XINT (start), XINT (end) - XINT (start), XINT (end) - XINT (start)); return Qt; |