aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2013-08-16 05:31:20 +0200
committerJoakim Verona2013-08-16 05:31:20 +0200
commit6d2a4fc753d8533b4124fe59432bf4991c1db6b7 (patch)
treef23d2fc2ea99ebc13acda7efcc5588382927bb45
parent9e72ced38d4303cf7b946ae990672e7d84bbd480 (diff)
parentc8068af56770f8b0be93218e76dd17ea508f3365 (diff)
downloademacs-6d2a4fc753d8533b4124fe59432bf4991c1db6b7.tar.gz
emacs-6d2a4fc753d8533b4124fe59432bf4991c1db6b7.zip
merge from trunk
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--doc/lispref/text.texi8
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d0099404ff1..fcb47b30f9a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,6 +1,6 @@
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. 3 * text.texi (Insertion): Refine.
4 4
5 * positions.texi (Character Motion): 5 * positions.texi (Character Motion):
6 * markers.texi (Moving Markers): 6 * markers.texi (Moving Markers):
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index bc79971188e..17a1798be2f 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -423,10 +423,10 @@ insertion point. @xref{Sticky Properties}.
423 423
424@defun insert-buffer-substring from-buffer-or-name &optional start end 424@defun insert-buffer-substring from-buffer-or-name &optional start end
425This function inserts a portion of buffer @var{from-buffer-or-name} 425This function inserts a portion of buffer @var{from-buffer-or-name}
426(which must already exist) into the current buffer before point. The 426into the current buffer before point. The text inserted is the region
427text inserted is the region between @var{start} and @var{end}. (These 427between @var{start} (inclusive) and @var{end} (exclusive). (These
428arguments default to the beginning and end of the accessible portion of 428arguments default to the beginning and end of the accessible portion
429that buffer.) This function returns @code{nil}. 429of that buffer.) This function returns @code{nil}.
430 430
431In this example, the form is executed with buffer @samp{bar} as the 431In this example, the form is executed with buffer @samp{bar} as the
432current buffer. We assume that buffer @samp{bar} is initially empty. 432current buffer. We assume that buffer @samp{bar} is initially empty.