summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-05-16 22:15:32 +0300
committerEli Zaretskii <eliz@gnu.org>2013-05-16 22:15:32 +0300
commit04d360e7bb114321e9b9e35f6e8edb8ec0766f18 (patch)
treee5ff64d3d1619b3ad5fd1fad29c3c32d9f92a9d3
parent5bb98290d7f11fc6b9fb2d8b33277483f5f3ccc4 (diff)
downloademacs-04d360e7bb114321e9b9e35f6e8edb8ec0766f18.tar.gz
Document arguments of insert_1_both.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/insdel.c9
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 42b21abc8ae..6909367dccb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2013-05-16 Eli Zaretskii <eliz@gnu.org>
+ * insdel.c (insert_1_both): Document the arguments, instead of
+ referring to insert_1, which no longer exists.
+
* xdisp.c (message_dolog): If the *Messages* buffer is shown in
some window, increment windows_or_buffers_changed, so that
*Messages* display in that window is updated. (Bug#14408)
diff --git a/src/insdel.c b/src/insdel.c
index 8029291cd68..ed684264249 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -771,8 +771,13 @@ count_combining_after (const unsigned char *string,
/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
- starting at STRING. INHERIT, PREPARE and BEFORE_MARKERS
- are the same as in insert_1. */
+ starting at STRING. INHERIT non-zero means inherit the text
+ properties from neighboring characters; zero means inserted text
+ will have no text properties. PREPARE non-zero means call
+ prepare_to_modify_buffer, which checks that the region is not
+ read-only, and calls before-change-function and any modification
+ properties the text may have. BEFORE_MARKERS non-zero means adjust
+ all markers that point at the insertion place to point after it. */
void
insert_1_both (const char *string,