aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorJoakim Verona2013-08-18 21:31:48 +0200
committerJoakim Verona2013-08-18 21:31:48 +0200
commitfd4e76c279715cbaa57465ea9ffbe68fb84d8299 (patch)
tree81e2506023397c778c29cf1139d8f37159a29a17 /doc/lispref
parenta8761f8c13d9507250a7d95c687bb3999ca5ac11 (diff)
parente2c904739e881006f70c9b491929bd4a3508c85d (diff)
downloademacs-fd4e76c279715cbaa57465ea9ffbe68fb84d8299.tar.gz
emacs-fd4e76c279715cbaa57465ea9ffbe68fb84d8299.zip
merge from trunk
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/markers.texi7
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7618736ee4f..995203b5109 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12013-08-18 Eli Zaretskii <eliz@gnu.org>
2
3 * markers.texi (The Region): Improve indexing.
4
12013-08-17 Xue Fuqiao <xfq.free@gmail.com> 52013-08-17 Xue Fuqiao <xfq.free@gmail.com>
2 6
3 * modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes. 7 * modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes.
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index 3863e2f980a..d94908994e9 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -654,7 +654,12 @@ more marks than this are pushed onto the @code{mark-ring},
654 654
655@node The Region 655@node The Region
656@section The Region 656@section The Region
657@cindex region (between point and mark) 657@c The index entry must be just ``region'' to make it the first hit
658@c when the user types ``i region RET'', because otherwise the Info
659@c reader will present substring matches in alphabetical order,
660@c putting this one near the end, with something utterly unrelated as
661@c the first hit.
662@cindex region
658 663
659 The text between point and the mark is known as @dfn{the region}. 664 The text between point and the mark is known as @dfn{the region}.
660Various functions operate on text delimited by point and the mark, but 665Various functions operate on text delimited by point and the mark, but