(The Mark) <handle-shift-selection>: Update for removal of the optional

argument DEACTIVATE.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f0f6f754fc3bd83705ce652a3029f4437f645f39..11565e9041e97bfa358af7104d63ae3fcdcad347 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * markers.texi (The Mark) <handle-shift-selection>: Update for
+       removal of the optional argument DEACTIVATE.
+
 2009-03-25  Chong Yidong  <cyd@stupidchicken.com>
 
        * commands.texi (Focus Events): Most X window managers don't use

diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index e636ce97078e9e8e6d4c2cedc6830ace71a27361..54b674b4669b1cb766039607c6581e3a76cd231b 100644 (file)
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -650,18 +650,19 @@ more marks than this are pushed onto the @code{mark-ring},
 @code{push-mark} discards an old mark when it adds a new one.
 @end defopt
 
-@defun handle-shift-selection &optional deactivate
+@defun handle-shift-selection
 This function checks whether the current command was invoked via shift
 translation (@pxref{Key Sequence Input, shift-translation}), and if
 so, sets the mark and temporarily activates the region, unless the
 region is already temporarily activated in this way.  If the command
-was invoked without shift translation, or if the optional argument
-@var{deactivate} is non-@code{nil}, the function deactivates the mark.
+was invoked without shift translation and the region is temporarily
+active, or if the region was activated by the mouse, the function
+deactivates the mark.
+
 This function is called whenever a command with a @samp{^} character
 in its @code{interactive} spec (@pxref{Interactive Codes, ^}) is
 invoked while @code{shift-select-mode} (@pxref{Shift Selection,,,
 emacs, The GNU Emacs Manual}) is non-@code{nil}.
-
 @end defun
 
 @node The Region