Merge from origin/emacs-25

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

diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index 9aec6202de633543bd341e8cc1f147e8d943898c..f9f231d762c4559c58bd44eb1aaae6fd6390cd1d 100644 (file)
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 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 Indentation
@@ -35,7 +35,7 @@ mode and related major modes, @key{TAB} normally inserts some
 combination of space and tab characters to advance point to the next
 tab stop (@pxref{Tab Stops}).  For this purpose, the position of the
 first non-whitespace character on the preceding line is treated as an
-additional tab stop, so you can use @key{TAB} to ``align'' point with
+additional tab stop, so you can use @key{TAB} to align point with
 the preceding line.  If the region is active (@pxref{Using Region}),
 @key{TAB} acts specially: it indents each line in the region so that
 its first non-whitespace character is aligned with the preceding line.
@@ -64,11 +64,6 @@ Emacs provides a variety of commands to perform indentation in other
 ways.
 
 @table @kbd
-@item C-j
-@kindex C-j
-@findex newline-and-indent
-Perform @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
-
 @item C-M-o
 @kindex C-M-o
 @findex split-line
@@ -103,7 +98,7 @@ argument, in which case do nothing.
 @kindex M-^
 @findex delete-indentation
 Merge the previous and the current line (@code{delete-indentation}).
-This ``joins'' the two lines cleanly, by replacing any indentation at
+This joins the two lines cleanly, by replacing any indentation at
 the front of the current line, together with the line boundary, with a
 single space.
 
@@ -128,7 +123,7 @@ that column number.
 @findex indent-rigidly
 @cindex remove indentation
 This command is used to change the indentation of all lines that begin
-in the region, moving the affected lines as a ``rigid'' unit.
+in the region, moving the affected lines as a rigid unit.
 
 If called with no argument, the command activates a transient mode for
 adjusting the indentation of the affected lines interactively.  While
@@ -158,11 +153,11 @@ C-u -999 C-x @key{TAB}
 are used as stopping points by @key{TAB} when inserting whitespace in
 Text mode and related modes (@pxref{Indentation}), and by commands
 like @kbd{M-i} (@pxref{Indentation Commands}).  The variable
-@code{tab-stop-list} controls these positions.  The default value
-is @code{nil}, which means a tab stop every 8 columns.  The value
-can also be a list of column numbers (in increasing order) at which to
-place tab stops.  Emacs extends the list forever by repeating the
-difference between the last and next-to-last elements.
+@code{tab-stop-list} controls these positions.  The default value is
+@code{nil}, which means a tab stop every 8 columns.  The value can
+also be a list of zero-based column numbers (in increasing order) at
+which to place tab stops.  Emacs extends the list forever by repeating
+the difference between the last and next-to-last elements.
 
 @findex edit-tab-stops
 @kindex C-c C-c @r{(Edit Tab Stops)}
@@ -203,7 +198,7 @@ are always displayed as empty spaces extending to the next
 @dfn{display tab stop}.  @xref{Text Display}.
 
 @node Just Spaces
-@section Tabs vs. Spaces
+@section Tabs vs.@: Spaces
 
 @vindex tab-width
   Normally, indentation commands insert (or remove) an optimal mix of
@@ -256,4 +251,5 @@ indentation; otherwise, it inserts a tab character.
   Electric Indent mode is a global minor mode that automatically
 indents the line after every @key{RET} you type.  This mode is enabled
 by default.  To toggle this minor mode, type @kbd{M-x
-electric-indent-mode}.
+electric-indent-mode}.  To toggle the mode in a single buffer,
+use @kbd{M-x electric-indent-local-mode}.