; Merge from origin/emacs-25

[gnu-emacs] / doc / emacs / mark.texi

diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index c975f6ebe6b96633ef84bfa283fd3909b09e0762..fdba0a47461c59cb80dd809777cac85c05283c17 100644 (file)
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2016 Free Software
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Mark
@@ -43,7 +43,7 @@ Ordinarily, only the selected window highlights its region; however,
 if the variable @code{highlight-nonselected-windows} is
 non-@code{nil}, each window highlights its own region.
 
-  There is another kind of region: the ``rectangular region''.
+  There is another kind of region: the rectangular region.
 @xref{Rectangles}.
 
 @menu
@@ -69,9 +69,9 @@ The same.
 @item C-x C-x
 Set the mark at point, and activate it; then move point where the mark
 used to be (@code{exchange-point-and-mark}).
-@item Drag-Mouse-1
+@item Drag-mouse-1
 Set point and the mark around the text you drag across.
-@item Mouse-3
+@item mouse-3
 Set the mark at point, then move point to where you click
 (@code{mouse-save-then-kill}).
 @item @samp{Shifted cursor motion keys}
@@ -105,7 +105,7 @@ region also automatically deactivate the mark, like @kbd{C-x C-u} in
 the above example.
 
   Instead of setting the mark in order to operate on a region, you can
-also use it to ``remember'' a position in the buffer (by typing
+also use it to remember a position in the buffer (by typing
 @kbd{C-@key{SPC} C-@key{SPC}}), and later jump back there (by typing
 @kbd{C-u C-@key{SPC}}).  @xref{Mark Ring}, for details.
 
@@ -275,7 +275,7 @@ active.  If you change the value to @code{kill}, these commands
 behavior.  Such commands usually have the word @code{region} in their
 names, like @kbd{C-w} (@code{kill-region}) and @code{C-x C-u}
 (@code{upcase-region}).  If the mark is inactive, they operate on the
-``inactive region''---that is, on the text between point and the
+@dfn{inactive region}---that is, on the text between point and the
 position at which the mark was last set (@pxref{Mark Ring}).  To
 disable this behavior, change the variable
 @code{mark-even-if-inactive} to @code{nil}.  Then these commands will
@@ -286,10 +286,13 @@ instead signal an error if the mark is inactive.
 @findex delete-selection-mode
   By default, text insertion occurs normally even if the mark is
 active---for example, typing @kbd{a} inserts the character @samp{a},
-then deactivates the mark.  If you enable Delete Selection mode, a
-minor mode, then inserting text while the mark is active causes the
-text in the region to be deleted first.  To toggle Delete Selection
-mode on or off, type @kbd{M-x delete-selection-mode}.
+then deactivates the mark.  Delete Selection mode, a minor mode,
+modifies this behavior: if you enable that mode, then inserting text
+while the mark is active causes the text in the region to be deleted
+first.  Also, commands that normally delete just one character, such
+as @kbd{C-d} or @kbd{@key{DEL}}, will delete the entire region
+instead.  To toggle Delete Selection mode on or off, type @kbd{M-x
+delete-selection-mode}.
 
 @node Mark Ring
 @section The Mark Ring