aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el14
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23caba15449..a48ac37883f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-11-28 Chong Yidong <cyd@gnu.org> 12012-11-28 Chong Yidong <cyd@gnu.org>
2 2
3 * simple.el (transient-mark-mode): Doc fix (Bug#11523).
4
3 * buff-menu.el (Buffer-menu-delete-backwards, Buffer-menu-mode) 5 * buff-menu.el (Buffer-menu-delete-backwards, Buffer-menu-mode)
4 (buffer-menu): Doc fix (Bug#12294). 6 (buffer-menu): Doc fix (Bug#12294).
5 7
diff --git a/lisp/simple.el b/lisp/simple.el
index 5867561da26..589f1786fb4 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4332,14 +4332,14 @@ else--for example, incremental search, \\[beginning-of-buffer], and \\[end-of-bu
4332You can also deactivate the mark by typing \\[keyboard-quit] or 4332You can also deactivate the mark by typing \\[keyboard-quit] or
4333\\[keyboard-escape-quit]. 4333\\[keyboard-escape-quit].
4334 4334
4335Many commands change their behavior when Transient Mark mode is in effect 4335Many commands change their behavior when Transient Mark mode is
4336and the mark is active, by acting on the region instead of their usual 4336in effect and the mark is active, by acting on the region instead
4337default part of the buffer's text. Examples of such commands include 4337of their usual default part of the buffer's text. Examples of
4338\\[comment-dwim], \\[flush-lines], \\[keep-lines], \ 4338such commands include \\[comment-dwim], \\[flush-lines], \\[keep-lines],
4339\\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo]. 4339\\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo].
4340Invoke \\[apropos-documentation] and type \"transient\" or 4340To see the documentation of commands which are sensitive to the
4341\"mark.*active\" at the prompt, to see the documentation of 4341Transient Mark mode, invoke \\[apropos-documentation] and type \"transient\"
4342commands which are sensitive to the Transient Mark mode." 4342or \"mark.*active\" at the prompt."
4343 :global t 4343 :global t
4344 ;; It's defined in C/cus-start, this stops the d-m-m macro defining it again. 4344 ;; It's defined in C/cus-start, this stops the d-m-m macro defining it again.
4345 :variable transient-mark-mode) 4345 :variable transient-mark-mode)