aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorJoakim Verona2013-08-16 04:11:12 +0200
committerJoakim Verona2013-08-16 04:11:12 +0200
commit9e72ced38d4303cf7b946ae990672e7d84bbd480 (patch)
tree48a2a775cd5f5408cba904ecb101922e3cff9c47 /src/editfns.c
parent858133b65d760c087b38fe463b9eae49a1c319d7 (diff)
parentde179a3e1ef3a8a8dc4e1fe548d057c61b178f35 (diff)
downloademacs-9e72ced38d4303cf7b946ae990672e7d84bbd480.tar.gz
emacs-9e72ced38d4303cf7b946ae990672e7d84bbd480.zip
merge from trunk
Diffstat (limited to 'src/editfns.c')
-rw-r--r--src/editfns.c4
1 files changed, 4 insertions, 0 deletions
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{