aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/editfns.c4
2 files changed, 6 insertions, 0 deletions
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{