Minor fixups for external socket launching

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

diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 6ed3b2e6d37d0ee2578b18cbdff8839c1235bd05..dd47532e7ed78b435f4c05f6bbd028bf4233e802 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-2013 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,6 +43,9 @@ 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.
+@xref{Rectangles}.
+
 @menu
 * Setting Mark::            Commands to set the mark.
 * Marking Objects::         Commands to put region around textual units.
@@ -102,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.
 
@@ -130,8 +133,8 @@ detailed description of these mouse commands.
 
 @cindex shift-selection
   Finally, you can set the mark by holding down the shift key while
-typing certain cursor motion commands (such as @kbd{S-@key{right}},
-@kbd{S-C-f}, @kbd{S-C-n}, etc.)  This is called @dfn{shift-selection}.
+typing certain cursor motion commands (such as @kbd{S-@key{RIGHT}},
+@kbd{S-C-f}, @kbd{S-C-n}, etc.).  This is called @dfn{shift-selection}.
 It sets the mark at point before moving point, but only if there is no
 active mark set via shift-selection.  The mark set by mouse commands
 and by shift-selection behaves slightly differently from the usual
@@ -272,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
@@ -283,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