merge from trunk

[gnu-emacs] / src / editfns.c

diff --git a/src/editfns.c b/src/editfns.c
index 90346a88eb20d01f6a3c990fd2a6dd92bf75de1c..bbaeaea5240f8bca9787fe48d6ffb8594614ac33 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2330,6 +2330,10 @@ to multibyte for insertion (see `unibyte-char-to-multibyte').
 If the current buffer is unibyte, multibyte strings are converted
 to unibyte for insertion.
 
+If an overlay begins at the insertion point, the inserted text falls
+outside the overlay; if a nonempty overlay ends at the insertion
+point, the inserted text falls inside that overlay.
+
 usage: (insert-before-markers &rest ARGS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {