summaryrefslogtreecommitdiff
path: root/lispref/markers.texi
diff options
context:
space:
mode:
Diffstat (limited to 'lispref/markers.texi')
-rw-r--r--lispref/markers.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/lispref/markers.texi b/lispref/markers.texi
index 4eb34ce13a..d9f6d19a4b 100644
--- a/lispref/markers.texi
+++ b/lispref/markers.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
-@c Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
+@c 2004, 2005 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../info/markers
@node Markers, Text, Positions, Top
@@ -444,7 +444,7 @@ programming. So we do not describe it here.
This function returns the current buffer's mark position as an integer.
If Transient Mark mode is enabled, @code{mark-even-if-inactive} is
-@code{nil} and and the mark is inactive, @code{mark} normally signals
+@code{nil} and the mark is inactive, @code{mark} normally signals
an error. However, if @var{force} is non-@code{nil}, then @code{mark}
returns the mark position anyway---or @code{nil}, if the mark is not
yet set for this buffer.