changeset 103894:60606ee8aee7

* markers.texi (The Mark): Document optional arg to deactivate-mark.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 15 Jul 2009 01:28:57 +0000
parents c75839749e65
children 8f9899f50e02
files doc/lispref/ChangeLog doc/lispref/markers.texi
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/doc/lispref/ChangeLog	Wed Jul 15 01:25:32 2009 +0000
+++ b/doc/lispref/ChangeLog	Wed Jul 15 01:28:57 2009 +0000
@@ -1,3 +1,8 @@
+2009-07-15  Chong Yidong  <cyd@stupidchicken.com>
+
+	* markers.texi (The Mark): Document optional arg to
+	deactivate-mark.
+
 2009-07-11  Kevin Ryde  <user42@zip.com.au>
 
 	* hooks.texi (Standard Hooks): Fix cross-references.
--- a/doc/lispref/markers.texi	Wed Jul 15 01:25:32 2009 +0000
+++ b/doc/lispref/markers.texi	Wed Jul 15 01:28:57 2009 +0000
@@ -576,9 +576,10 @@
 @end example
 @end defvar
 
-@defun deactivate-mark
-This function deactivates the mark, if Transient Mark mode is enabled.
-Otherwise it does nothing.
+@defun deactivate-mark &optional force
+This function deactivates the mark, provided Transient Mark mode is
+enabled or @var{force} is non-@code{nil}.  Deactivating the mark also
+runs @code{deactivate-mark-hook}, described below.
 @end defun
 
 @defvar mark-active