[Emacs-diffs] /srv/bzr/emacs/trunk r112613: Document arguments of insert_1_both.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112613
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-16 22:15:32 +0300
message:
  Document arguments of insert_1_both.
modified:
  src/ChangeLog
  src/insdel.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-16 18:33:27 +0000
+++ b/src/ChangeLog     2013-05-16 19:15:32 +0000
@@ -1,5 +1,8 @@
 2013-05-16  Eli Zaretskii  <address@hidden>
 
+       * 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)

=== modified file 'src/insdel.c'
--- a/src/insdel.c      2013-04-05 14:17:55 +0000
+++ b/src/insdel.c      2013-05-16 19:15:32 +0000
@@ -771,8 +771,13 @@
 
 
 /* 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,