* simple.el (transient-mark-mode): Doc fix (Bug#7465).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aaa55e9abfeb2a08ff3410ed2946b9ae8f5071e3..18bf0a40391f797f598300696a74ccaa8e24da4e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-04  Chong Yidong  <cyd@stupidchicken.com>
+
+       * simple.el (transient-mark-mode): Doc fix (Bug#7465).
+
 2010-12-04  Eli Zaretskii  <eliz@gnu.org>
 
        * files.el (file-relative-name): Handle UNC file names on

diff --git a/lisp/simple.el b/lisp/simple.el
index 3f4e12133b5699c9dc55f33093919b6c15bbd051..2946da3cdc63209be6f71560c39910ec8b54321c 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3916,15 +3916,17 @@ Non-nil also enables highlighting of the region whenever the mark is active.
 The variable `highlight-nonselected-windows' controls whether to highlight
 all windows or just the selected window.
 
-If the value is `lambda', that enables Transient Mark mode temporarily.
-After any subsequent action that would normally deactivate the mark
-\(such as buffer modification), Transient Mark mode is turned off.
-
-If the value is (only . OLDVAL), that enables Transient Mark mode
-temporarily.  After any subsequent point motion command that is not
-shift-translated, or any other action that would normally deactivate
-the mark (such as buffer modification), the value of
-`transient-mark-mode' is set to OLDVAL.")
+Lisp programs may give this variable certain special values:
+
+- A value of `lambda' enables Transient Mark mode temporarily.
+  It is disabled again after any subsequent action that would
+  normally deactivate the mark (e.g. buffer modification).
+
+- A value of (only . OLDVAL) enables Transient Mark mode
+  temporarily.  After any subsequent point motion command that is
+  not shift-translated, or any other action that would normally
+  deactivate the mark (e.g. buffer modification), the value of
+  `transient-mark-mode' is set to OLDVAL.")
 
 (defvar widen-automatically t
   "Non-nil means it is ok for commands to call `widen' when they want to.