Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru

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

diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index 52ecd37fcf21fad4a3008011b81c550cd8974ce5..b21be99e16cfcad3091cf5d7004e8896f94243fd 100644 (file)
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -1,8 +1,8 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
+@c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Modes, Indentation, International, Top
+@node Modes
 @chapter Major and Minor Modes
 
   Emacs contains many @dfn{editing modes} that alter its basic
@@ -65,12 +65,11 @@ process (@pxref{Interactive Shell}).
 first visit a file or create a buffer (@pxref{Choosing Modes}).  You
 can explicitly select a new major mode by using an @kbd{M-x} command.
 Take the name of the mode and add @code{-mode} to get the name of the
-command to select that mode.  Thus, you can enter Lisp mode with
-@kbd{M-x lisp-mode}.
+command to select that mode (e.g., @kbd{M-x lisp-mode} enters Lisp mode).
 
 @vindex major-mode
   The value of the buffer-local variable @code{major-mode} is a symbol
-with the same name as the major mode command (e.g. @code{lisp-mode}).
+with the same name as the major mode command (e.g., @code{lisp-mode}).
 This variable is set automatically; you should not change it yourself.
 
   The default value of @code{major-mode} determines the major mode to
@@ -81,9 +80,9 @@ change this default value via the Customization interface (@pxref{Easy
 Customization}), or by adding a line like this to your init file
 (@pxref{Init File}):
 
-@smallexample
+@example
 (setq-default major-mode 'text-mode)
-@end smallexample
+@end example
 
 @noindent
 If the default value of @code{major-mode} is @code{nil}, the major
@@ -111,7 +110,7 @@ list of its key bindings, type @code{C-h m} (@code{describe-mode}).
   Every major mode, apart from Fundamental mode, defines a @dfn{mode
 hook}, a customizable list of Lisp functions to run each time the mode
 is enabled in a buffer.  @xref{Hooks}, for more information about
-hooks.  Each mode hook is named after its major mode, e.g. Fortran
+hooks.  Each mode hook is named after its major mode, e.g., Fortran
 mode has @code{fortran-mode-hook}.  Furthermore, all text-based major
 modes run @code{text-mode-hook}, and all programming language modes
 run @code{prog-mode-hook}, prior to running their own mode hooks.
@@ -216,8 +215,7 @@ in individual buffers.  @xref{Faces}.
 @findex linum-mode
 @cindex Linum mode
 @item
-Linum mode displays each line's line number in the window's left
-margin.  Its mode command is @code{linum-mode}.
+Linum mode displays each line's line number in the window's left margin.
 
 @item
 Outline minor mode provides similar facilities to the major mode
@@ -265,8 +263,7 @@ in the region, if the region is active.  @xref{Using Region}.
 
 @item
 Icomplete mode displays an indication of available completions when
-you are in the minibuffer and completion is active.  @xref{Completion
-Options}.
+you are in the minibuffer and completion is active.  @xref{Icomplete}.
 
 @item
 Line Number mode enables display of the current line number in the