From e408289fa80874b9a4d6151bfe818b6300b9886f Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 4 Dec 2010 16:15:17 -0500 Subject: [PATCH] * simple.el (transient-mark-mode): Doc fix (Bug#7465). --- lisp/ChangeLog | 4 ++++ lisp/simple.el | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 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 + + * simple.el (transient-mark-mode): Doc fix (Bug#7465). + 2010-12-04 Eli Zaretskii * 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. +Lisp programs may give this variable certain special values: -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.") +- 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.