summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-02-13 11:09:21 +0200
committerEli Zaretskii <eliz@gnu.org>2015-02-13 11:09:21 +0200
commit8b3ba7ae659571897f270a657379dce38e59a718 (patch)
treeb71cd6984de383efeb92586abb91d03bb1c175ab
parent72fd047e6878f1db44e4d64a2b5049ecf7bac079 (diff)
downloademacs-8b3ba7ae659571897f270a657379dce38e59a718.tar.gz
Improve docs of transient-mark-mode (Bug#19841)
src/buffer.c (syms_of_buffer): Doc fix. lisp/simple.el (transient-mark-mode): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el9
-rw-r--r--src/ChangeLog4
-rw-r--r--src/buffer.c1
4 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fb752a48a9..9852068ed68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-13 Eli Zaretskii <eliz@gnu.org>
+
+ * simple.el (transient-mark-mode): Doc fix. (Bug#19841)
+
2015-02-12 Agustín Martín Domingo <agustin6martin@gmail.com>
Improve string search in `flyspell-word-search-*`. (Bug#16800)
diff --git a/lisp/simple.el b/lisp/simple.el
index 497e4a1604f..ae07f6237ce 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4810,10 +4810,11 @@ positive, and disable it otherwise. If called from Lisp, enable
Transient Mark mode if ARG is omitted or nil.
Transient Mark mode is a global minor mode. When enabled, the
-region is highlighted whenever the mark is active. The mark is
-\"deactivated\" by changing the buffer, and after certain other
-operations that set the mark but whose main purpose is something
-else--for example, incremental search, \\[beginning-of-buffer], and \\[end-of-buffer].
+region is highlighted with the `region' face whenever the mark
+is active. The mark is \"deactivated\" by changing the buffer,
+and after certain other operations that set the mark but whose
+main purpose is something else--for example, incremental search,
+\\[beginning-of-buffer], and \\[end-of-buffer].
You can also deactivate the mark by typing \\[keyboard-quit] or
\\[keyboard-escape-quit].
diff --git a/src/ChangeLog b/src/ChangeLog
index 7a7fd23d43d..20d3fb34034 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-13 Eli Zaretskii <eliz@gnu.org>
+
+ * buffer.c (syms_of_buffer): Doc fix. (Bug#19841)
+
2015-02-08 Eli Zaretskii <eliz@gnu.org>
* xfaces.c (map_tty_color): Use assoc_no_quit instead of
diff --git a/src/buffer.c b/src/buffer.c
index 250d8d24d7b..b3b971633dd 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6242,6 +6242,7 @@ If the buffer has never been shown in a window, the value is nil. */);
See the command `transient-mark-mode' for a description of this minor mode.
Non-nil also enables highlighting of the region whenever the mark is active.
+The region is highlighted with the `region' face.
The variable `highlight-nonselected-windows' controls whether to highlight
all windows or just the selected window.