[Emacs-diffs] Changes to emacs/man/indent.texi

[Richard M . Stallman]

Index: emacs/man/indent.texi
diff -c emacs/man/indent.texi:1.15 emacs/man/indent.texi:1.16
*** emacs/man/indent.texi:1.15  Mon Aug 30 22:02:36 2004
--- emacs/man/indent.texi       Wed Feb 16 10:05:39 2005
***************
*** 16,22 ****
  Perform @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
  @item M-^
  Merge the previous and the current line (@code{delete-indentation}).
! This would cancel out the effect of @kbd{C-j}.
  @item C-M-o
  Split the current line at point; text on the line after point becomes a
  new line indented to the same column where point is located
--- 16,22 ----
  Perform @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
  @item M-^
  Merge the previous and the current line (@code{delete-indentation}).
! This would cancel the effect of a preceding @kbd{C-j}.
  @item C-M-o
  Split the current line at point; text on the line after point becomes a
  new line indented to the same column where point is located
***************
*** 25,33 ****
  Move (forward or back) to the first nonblank character on the current
  line (@code{back-to-indentation}).
  @item C-M-\
! Indent several lines to the same column (@code{indent-region}).
  @item C-x @key{TAB}
! Shift a block of lines rigidly right or left (@code{indent-rigidly}).
  @item M-i
  Indent from point to the next prespecified tab stop column
  (@code{tab-to-tab-stop}).
--- 25,33 ----
  Move (forward or back) to the first nonblank character on the current
  line (@code{back-to-indentation}).
  @item C-M-\
! Indent lines in the region to the same column (@code{indent-region}).
  @item C-x @key{TAB}
! Shift lines in the region rigidly right or left (@code{indent-rigidly}).
  @item M-i
  Indent from point to the next prespecified tab stop column
  (@code{tab-to-tab-stop}).
***************
*** 47,57 ****
  stop is eight.  @xref{Display Custom}, for more details.
  
  @item
! Advance to the next tab stop.  You can set tab stops at your choice of
! column positions, then type @kbd{M-i} to advance to the next tab stop.
! The default is to have tab stops every eight columns, which means by
! default @kbd{M-i} inserts a tab character.  To set the tab stops, use
! @kbd{M-x edit-tab-stops}.
  
  @item
  Align a line with the previous line.  More precisely, the command
--- 47,57 ----
  stop is eight.  @xref{Display Custom}, for more details.
  
  @item
! Insert whitespace up to the next tab stop.  You can set tab stops at
! your choice of column positions, then type @kbd{M-i} to advance to the
! next tab stop.  The default tab stop settings have a tab stop every
! eight columns, which means by default @kbd{M-i} inserts a tab
! character.  To set the tab stops, use @kbd{M-x edit-tab-stops}.
  
  @item
  Align a line with the previous line.  More precisely, the command
***************
*** 72,86 ****
  type @key{TAB}, it aligns the line as a whole.
  @end enumerate
  
!   Normally, all of the above methods insert an optimal mix of tabs and
  spaces to align to the desired column.  @xref{Just Spaces}, for how to
  disable use of tabs.  However, @kbd{C-q @key{TAB}} always inserts a
  tab, even when tabs are disabled for the indentation commands.
  
- @c   In Text mode, @key{TAB} runs the command @code{tab-to-tab-stop}, which
- @c indents to the next tab stop column.  You can set the tab stops with
- @c @kbd{M-x edit-tab-stops}.
- 
  @menu
  * Indentation Commands::  Various commands and techniques for indentation.
  * Tab Stops::             You can set arbitrary "tab stops" and then
--- 72,82 ----
  type @key{TAB}, it aligns the line as a whole.
  @end enumerate
  
!   Normally, most of the above methods insert an optimal mix of tabs and
  spaces to align to the desired column.  @xref{Just Spaces}, for how to
  disable use of tabs.  However, @kbd{C-q @key{TAB}} always inserts a
  tab, even when tabs are disabled for the indentation commands.
  
  @menu
  * Indentation Commands::  Various commands and techniques for indentation.
  * Tab Stops::             You can set arbitrary "tab stops" and then