Update copyright year to 2015

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

diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index e0c269ad57553886f8783be7a6d33587e7ee081c..10cd1310d61a12a9359b09255d5e60e0534cfc8b 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-2015 Free Software
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Indentation
@@ -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
@@ -157,10 +152,12 @@ C-u -999 C-x @key{TAB}
   Emacs defines certain column numbers to be @dfn{tab stops}.  These
 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}).  By default, tab stops
-are located every 8 columns.  These positions are stored in the
-variable @code{tab-stop-list}, whose value is a list of column numbers
-in increasing order.
+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 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)}
@@ -178,12 +175,15 @@ To install changes, type C-c C-c
 
 @noindent
 The first line contains a colon at each tab stop.  The numbers on the
-next two lines are present just to indicate where the colons are.  It
-is implicitly extended to infinity by repeating the last step.
+next two lines are present just to indicate where the colons are.
+If the value of @code{tab-stop-list} is @code{nil}, as it is by default,
+no colons are displayed initially.
 
   You can edit this buffer to specify different tab stops by placing
 colons on the desired columns.  The buffer uses Overwrite mode
-(@pxref{Minor Modes}).  When you are done, type @kbd{C-c C-c} to make
+(@pxref{Minor Modes}).  Remember that Emacs will extend the list of
+tab stops forever by repeating the difference between the last two
+explicit stops that you place.  When you are done, type @kbd{C-c C-c} to make
 the new tab stops take effect.  Normally, the new tab stop settings
 apply to all buffers.  However, if you have made the
 @code{tab-stop-list} variable local to the buffer where you called
@@ -251,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}.