Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.782
diff -u -c -r1.782 simple.el
cvs diff: conflicting specifications of output style
*** simple.el	28 Dec 2005 21:52:33 -0000	1.782
--- simple.el	4 Jan 2006 22:14:15 -0000
***************
*** 1,7 ****
  ;;; simple.el --- basic editing commands for Emacs
  
  ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! ;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: internal
--- 1,7 ----
  ;;; simple.el --- basic editing commands for Emacs
  
  ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! ;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: internal
***************
*** 3069,3078 ****
    "Hook run when the mark becomes inactive.")
  
  (defun mark (&optional force)
!   "Return this buffer's mark value as integer; error if mark inactive.
! If optional argument FORCE is non-nil, access the mark value
! even if the mark is not currently active, and return nil
! if there is no mark at all.
  
  If you are using this in an editing command, you are most likely making
  a mistake; see the documentation of `set-mark'."
--- 3069,3082 ----
    "Hook run when the mark becomes inactive.")
  
  (defun mark (&optional force)
!   "Return this buffer's mark value.
! The return is an integer buffer position, or nil if the mark is not
! yet set for this buffer.
! 
! In `transient-mark-mode', and unless `mark-even-if-inactive' is set,
! then an error is signalled if the mark is inactive.  Optional
! argument FORCE can be non-nil to get the mark anyway (as an integer
! or nil).
  
  If you are using this in an editing command, you are most likely making
  a mistake; see the documentation of `set-mark'."