aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--doc/lispref/text.texi3
-rw-r--r--src/ChangeLog2
-rw-r--r--src/editfns.c4
4 files changed, 10 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 038705c2f05..d0099404ff1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
12013-08-16 Xue Fuqiao <xfq.free@gmail.com> 12013-08-16 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * text.texi (Insertion): Add cross-references.
4
3 * positions.texi (Character Motion): 5 * positions.texi (Character Motion):
4 * markers.texi (Moving Markers): 6 * markers.texi (Moving Markers):
5 (Creating Markers): Comment out undefined behavior. 7 (Creating Markers): Comment out undefined behavior.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 5346f8dcf58..bc79971188e 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -366,7 +366,8 @@ not relocate the marker, depending on the marker's insertion type
366the inserted text, regardless of the markers' insertion type. 366the inserted text, regardless of the markers' insertion type.
367 367
368 Insertion functions signal an error if the current buffer is 368 Insertion functions signal an error if the current buffer is
369read-only or if they insert within read-only text. 369read-only (@pxref{Read Only Buffers}) or if they insert within
370read-only text (@pxref{Special Properties}).
370 371
371 These functions copy text characters from strings and buffers along 372 These functions copy text characters from strings and buffers along
372with their properties. The inserted characters have exactly the same 373with their properties. The inserted characters have exactly the same
diff --git a/src/ChangeLog b/src/ChangeLog
index 5dc29ff47ab..ab21a65a805 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12013-08-16 Xue Fuqiao <xfq.free@gmail.com> 12013-08-16 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * editfns.c (insert_before_markers): Mention overlay in the doc string.
4
3 * marker.c (set_marker): Remove documentation of undefined behavior. 5 * marker.c (set_marker): Remove documentation of undefined behavior.
4 6
52013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org> 72013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/src/editfns.c b/src/editfns.c
index 90346a88eb2..bbaeaea5240 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2330,6 +2330,10 @@ to multibyte for insertion (see `unibyte-char-to-multibyte').
2330If the current buffer is unibyte, multibyte strings are converted 2330If the current buffer is unibyte, multibyte strings are converted
2331to unibyte for insertion. 2331to unibyte for insertion.
2332 2332
2333If an overlay begins at the insertion point, the inserted text falls
2334outside the overlay; if a nonempty overlay ends at the insertion
2335point, the inserted text falls inside that overlay.
2336
2333usage: (insert-before-markers &rest ARGS) */) 2337usage: (insert-before-markers &rest ARGS) */)
2334 (ptrdiff_t nargs, Lisp_Object *args) 2338 (ptrdiff_t nargs, Lisp_Object *args)
2335{ 2339{