aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-03-06 21:51:40 -0500
committerGlenn Morris2012-03-06 21:51:40 -0500
commit2ad809416d0d9fb2b4cac6136cf3270dee1feb24 (patch)
tree386e6d8bbd407531253864c18a9805a0d3fec06a
parent763d4948eea56272e3925c647d0aa5e9b83e9c2e (diff)
downloademacs-2ad809416d0d9fb2b4cac6136cf3270dee1feb24.tar.gz
emacs-2ad809416d0d9fb2b4cac6136cf3270dee1feb24.zip
Small lispref/markers.texi edits
* doc/lispref/markers.texi (Overview of Markers): Copyedits. (Creating Markers): Update approximate example buffer size. (The Mark): Don't mention uninteresting return values.
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/markers.texi34
2 files changed, 24 insertions, 16 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7f11c65f9e1..59d900ff82c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
12012-03-07 Glenn Morris <rgm@gnu.org>
2
3 * markers.texi (Overview of Markers): Copyedits.
4 (Creating Markers): Update approximate example buffer size.
5 (The Mark): Don't mention uninteresting return values.
6
12012-03-05 Chong Yidong <cyd@gnu.org> 72012-03-05 Chong Yidong <cyd@gnu.org>
2 8
3 * positions.texi (Text Lines): Document count-words. 9 * positions.texi (Text Lines): Document count-words.
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index e8a009de401..2bcbf153d8b 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -1,6 +1,6 @@
1@c -*-texinfo-*- 1@c -*-texinfo-*-
2@c This is part of the GNU Emacs Lisp Reference Manual. 2@c This is part of the GNU Emacs Lisp Reference Manual.
3@c Copyright (C) 1990-1995, 1998-1999, 2001-2012 Free Software Foundation, Inc. 3@c Copyright (C) 1990-1995, 1998-1999, 2001-2012 Free Software Foundation, Inc.
4@c See the file elisp.texi for copying conditions. 4@c See the file elisp.texi for copying conditions.
5@setfilename ../../info/markers 5@setfilename ../../info/markers
6@node Markers, Text, Positions, Top 6@node Markers, Text, Positions, Top
@@ -27,8 +27,8 @@ deleted, so that it stays with the two characters on either side of it.
27@node Overview of Markers 27@node Overview of Markers
28@section Overview of Markers 28@section Overview of Markers
29 29
30 A marker specifies a buffer and a position in that buffer. The 30 A marker specifies a buffer and a position in that buffer. A
31marker can be used to represent a position in the functions that 31marker can be used to represent a position in functions that
32require one, just as an integer could be used. In that case, the 32require one, just as an integer could be used. In that case, the
33marker's buffer is normally ignored. Of course, a marker used in this 33marker's buffer is normally ignored. Of course, a marker used in this
34way usually points to a position in the buffer that the function 34way usually points to a position in the buffer that the function
@@ -38,12 +38,12 @@ operates on, but that is entirely the programmer's responsibility.
38 A marker has three attributes: the marker position, the marker 38 A marker has three attributes: the marker position, the marker
39buffer, and the insertion type. The marker position is an integer 39buffer, and the insertion type. The marker position is an integer
40that is equivalent (at a given time) to the marker as a position in 40that is equivalent (at a given time) to the marker as a position in
41that buffer. But the marker's position value can change often during 41that buffer. But the marker's position value can change during
42the life of the marker. Insertion and deletion of text in the buffer 42the life of the marker, and often does. Insertion and deletion of
43relocate the marker. The idea is that a marker positioned between two 43text in the buffer relocate the marker. The idea is that a marker
44characters remains between those two characters despite insertion and 44positioned between two characters remains between those two characters
45deletion elsewhere in the buffer. Relocation changes the integer 45despite insertion and deletion elsewhere in the buffer. Relocation
46equivalent of the marker. 46changes the integer equivalent of the marker.
47 47
48@cindex marker relocation 48@cindex marker relocation
49 Deleting text around a marker's position leaves the marker between the 49 Deleting text around a marker's position leaves the marker between the
@@ -63,7 +63,7 @@ will continue to use time if they do point somewhere.
63 63
64@cindex markers as numbers 64@cindex markers as numbers
65 Because it is common to perform arithmetic operations on a marker 65 Because it is common to perform arithmetic operations on a marker
66position, most of the arithmetic operations (including @code{+} and 66position, most of these operations (including @code{+} and
67@code{-}) accept markers as arguments. In such cases, the marker 67@code{-}) accept markers as arguments. In such cases, the marker
68stands for its current position. 68stands for its current position.
69 69
@@ -188,7 +188,7 @@ chapter.
188(point-min-marker) 188(point-min-marker)
189 @result{} #<marker at 1 in markers.texi> 189 @result{} #<marker at 1 in markers.texi>
190(point-max-marker) 190(point-max-marker)
191 @result{} #<marker at 15573 in markers.texi> 191 @result{} #<marker at 24080 in markers.texi>
192@end group 192@end group
193 193
194@group 194@group
@@ -229,8 +229,8 @@ buffer.
229@end group 229@end group
230 230
231@group 231@group
232(copy-marker 20000) 232(copy-marker 90000)
233 @result{} #<marker at 7572 in markers.texi> 233 @result{} #<marker at 24080 in markers.texi>
234@end group 234@end group
235@end example 235@end example
236 236
@@ -509,7 +509,8 @@ example:
509This function sets the current buffer's mark to @var{position}, and 509This function sets the current buffer's mark to @var{position}, and
510pushes a copy of the previous mark onto @code{mark-ring}. If 510pushes a copy of the previous mark onto @code{mark-ring}. If
511@var{position} is @code{nil}, then the value of point is used. 511@var{position} is @code{nil}, then the value of point is used.
512@code{push-mark} returns @code{nil}. 512@c Doesn't seem relevant.
513@c @code{push-mark} returns @code{nil}.
513 514
514The function @code{push-mark} normally @emph{does not} activate the 515The function @code{push-mark} normally @emph{does not} activate the
515mark. To do that, specify @code{t} for the argument @var{activate}. 516mark. To do that, specify @code{t} for the argument @var{activate}.
@@ -523,8 +524,9 @@ This function pops off the top element of @code{mark-ring} and makes
523that mark become the buffer's actual mark. This does not move point in 524that mark become the buffer's actual mark. This does not move point in
524the buffer, and it does nothing if @code{mark-ring} is empty. It 525the buffer, and it does nothing if @code{mark-ring} is empty. It
525deactivates the mark. 526deactivates the mark.
526 527@c
527The return value is not meaningful. 528@c Seems even less relevant.
529@c The return value is not meaningful.
528@end defun 530@end defun
529 531
530@defopt transient-mark-mode 532@defopt transient-mark-mode