*** markers.texi.~1.24.~	2005-08-28 10:15:57.000000000 +1000
--- markers.texi	2006-01-05 09:18:54.602488696 +1100
***************
*** 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, 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
--- 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, 2002, 2003,
! @c   2004, 2005, 2006 Free Software Foundation, Inc.
  @c See the file elisp.texi for copying conditions.
  @setfilename ../info/markers
  @node Markers, Text, Positions, Top
***************
*** 441,453 ****
  
  @defun mark &optional force
  @cindex current buffer mark
! 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 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.
  @end defun
  
  @defun mark-marker
--- 441,454 ----
  
  @defun mark &optional force
  @cindex current buffer mark
! This function returns the current buffer's mark position as an
! integer, or @code{nil} if the mark is not yet set for this buffer.
  
! If Transient Mark mode is enabled, and unless
! @code{mark-even-if-inactive} is non-@code{nil}, then @code{mark}
! signals an error if the mark is inactive.  However, if @var{force} is
! non-@code{nil}, then @code{mark} returns the mark position anyway (an
! integer or @code{nil}).
  @end defun
  
  @defun mark-marker