X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2ab04b956544fc24132cee405f93c1a757ebca56..73512b8cff21a5d92ca72b6cfa34a9210d5a5441:/doc/emacs/modes.texi

diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index 4d574242c8..e79561ac00 100644
--- 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-2011
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2015 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
@@ -96,7 +95,7 @@ the rules of the language (@pxref{Indentation}).  The keys that are
 commonly changed are @key{TAB}, @key{DEL}, and @kbd{C-j}.  Many modes
 also define special commands of their own, usually bound in the prefix
 key @kbd{C-c}.  Major modes can also alter user options and variables;
-for instance, programming language modes typicaly set a buffer-local
+for instance, programming language modes typically set a buffer-local
 value for the variable @code{comment-start}, which determines how
 source code comments are delimited (@pxref{Comments}).
 
@@ -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.
@@ -200,6 +199,12 @@ becoming too long.  @xref{Filling}.
 Auto Save mode saves the buffer contents periodically to reduce the
 amount of work you can lose in case of a crash.  @xref{Auto Save}.
 
+@item
+Electric Quote mode automatically converts quotation marks.  For
+example, it requotes text typed @t{`like this'} to text @t{‘like
+this’}.  You can control what kind of text it operates in, and you can
+disable it entirely in individual buffers.  @xref{Quotation Marks}.
+
 @item
 Enriched mode enables editing and saving of formatted text.
 @xref{Enriched Text}.
@@ -216,8 +221,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 +269,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