summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-12-04 16:15:17 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-12-04 16:15:17 -0500
commite408289fa80874b9a4d6151bfe818b6300b9886f (patch)
treee29743f4dedceb72f17c439140c335be2303d729
parentbdef6a77401ddff3bdbbeb3b7fcbbfa4c0d14152 (diff)
downloademacs-e408289fa80874b9a4d6151bfe818b6300b9886f.tar.gz
* simple.el (transient-mark-mode): Doc fix (Bug#7465).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el20
2 files changed, 15 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aaa55e9abfe..18bf0a40391 100644
--- 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 3f4e12133b5..2946da3cdc6 100644
--- 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.