Merge from origin/emacs-24

[gnu-emacs] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 371588b3093df2ec3a488214739b3c7d2b1395ae..332d6d51a81d834c0743403e02cf52d8f9fbd428 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6196,6 +6196,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.