Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru

23 files changed, 98 insertions, 46 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 18e76e01400..601949af88e 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-05  Glenn Morris  <rgm@gnu.org>
+
+        * text.texi (HTML Mode): Remove deleted nxml C-RET binding.
+
 2012-12-21  Glenn Morris  <rgm@gnu.org>
 
         * emacs-xtra.texi (copying): The FSF does not sell copies of this.
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index cc5ecc475af..d50a841d509 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1917,7 +1917,7 @@ used as a cheap preview (@code{sgml-tags-invisible}).
   The major mode for editing XML documents is called nXML mode.  This
 is a powerful major mode that can recognize many existing XML schema
 and use them to provide completion of XML elements via
-@kbd{C-@key{RET}} or @kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
+@kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
 validation with error highlighting.  To enable nXML mode in an
 existing buffer, type @kbd{M-x nxml-mode}, or, equivalently, @kbd{M-x
 xml-mode}.  Emacs uses nXML mode for files which have the extension
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e701f61c6b0..31c81e62ac1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,17 @@
+2013-01-05  Glenn Morris  <rgm@gnu.org>
+
+        * display.texi (Overlay Properties): Mention field.  (Bug#13364)
+
+2013-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * hooks.texi (Standard Hooks): Use @item, not @itemx, as the first
+        directive in a group of items.
+
+2013-01-05  Chong Yidong  <cyd@gnu.org>
+
+        * keymaps.texi (Key Sequences): Remove obsolete sentence
+        (Bug#13356).
+
 2013-01-04  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
 
         * hash.texi (Defining Hash): Fix typo.  (Bug#13345)
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b1a096b24df..cc6e980dadc 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1559,6 +1559,14 @@ mouse onto the text in the overlay, Emacs displays a help string in the
 echo area, or in the tooltip window.  For details see @ref{Text
 help-echo}.
 
+@item field
+@kindex field @r{(overlay property)}
+@c Copied from Special Properties.
+Consecutive characters with the same @code{field} property constitute a
+@emph{field}.  Some motion functions including @code{forward-word} and
+@code{beginning-of-line} stop moving at a field boundary.
+@xref{Fields}.
+
 @item modification-hooks
 @kindex modification-hooks @r{(overlay property)}
 This property's value is a list of functions to be called if any
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index 40a3c162f58..745393f8166 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -121,7 +121,7 @@ The command loop runs this soon after @code{post-command-hook} (q.v.).
 @item delete-terminal-functions
 @xref{Multiple Terminals}.
 
-@itemx pop-up-frame-function
+@item pop-up-frame-function
 @itemx split-window-preferred-function
 @xref{Choosing Window Options}.
 
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index c4bbe303bf9..cb6c785905c 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -94,9 +94,6 @@ Manual}.
 (kbd "<f1> SPC") @result{} [f1 32]
 (kbd "C-M-<down>") @result{} [C-M-down]
 @end example
-
-This macro is not meant for use with arguments that vary---only
-with string constants.
 @end defun
 
 @node Keymap Basics
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b0c39ce8507..d756f4fd0f0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,28 @@
+2013-01-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * ada-mode.texi: Remove braces from @title argument.
+        * eudc.texi: Likewise.
+        * smtpmail.texi: Likewise.
+        * auth.texi (VERSION): Set before first use.
+        * emacs-gnutls.texi (VERSION): Likewise.
+        * pgg.texi (VERSION): Likewise.
+        * ede.texi (Top): Rename from top, all uses changed.
+        * eshell.texi: Add missing argument to @sp.
+        * forms.texi (Top): Reorder menu to match structure.
+        * htmlfontify.texi (Customisation): Add missing @item in
+        @enumerate.
+        * org.texi (Advanced features): Add missing argument for @item.
+        (Property searches): Use @backslashchar{} in macro argument.
+        * pcl-cvs.texi: Add missing argument to @sp.
+        (Movement commands): Fix use of @itemx.
+        * vip.texi (Misc Commands, Viewing the Buffer): Likewise.
+        * reftex.texi (Options (Creating Citations)): Add missing newline
+        before @end.
+        * tramp.texi (Obtaining Tramp): Remove extra dots.
+        (Configuration): Reorder menu to match structure.
+        (Remote shell setup): Replace literal NUL character by \0.
+        * viper.texi (Marking): Add missing argument for @item.
+
 2013-01-04  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS):
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index a5988684e06..926d6a5749c 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -25,7 +25,7 @@ modify this GNU manual.''
 
 @titlepage
 @sp 10
-@title{Ada Mode}
+@title Ada Mode
 @sp 2
 @subtitle An Emacs major mode for programming in Ada
 @subtitle Ada Mode Version 4.00
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 72b0338fb68..36ee400acca 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -2,11 +2,11 @@
 
 @include gnus-overrides.texi
 
+@set VERSION 0.3
+
 @setfilename ../../info/auth
 @settitle Emacs auth-source Library @value{VERSION}
 
-@set VERSION 0.3
-
 @copying
 This file describes the Emacs auth-source library.
 
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 2001c8fef68..cadd815025c 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -63,7 +63,7 @@ modify this GNU manual.''
 
 @contents
 
-@node top, EDE Project Concepts, (dir), (dir)
+@node Top, EDE Project Concepts, (dir), (dir)
 @top EDE
 @comment  node-name,  next,  previous,  up
 
@@ -91,7 +91,7 @@ learn and adopt GNU ways of doing things.
 * GNU Free Documentation License::  The license for this documentation.
 @end menu
 
-@node EDE Project Concepts, EDE Mode, top, top
+@node EDE Project Concepts, EDE Mode, Top, Top
 @chapter @ede{} Project Concepts
 
 @ede{} is a generic interface for managing projects.  It specifies a
@@ -126,7 +126,7 @@ of search to files in a single target, or to discover the location of
 documentation or interface files.  @ede{} can provide this
 information.
 
-@node EDE Mode, Quick Start, EDE Project Concepts, top
+@node EDE Mode, Quick Start, EDE Project Concepts, Top
 @chapter @ede{} Mode
 
 @ede{} is implemented as a minor mode, which augments other modes such
@@ -143,7 +143,7 @@ bar.  This menu provides several menu items for high-level @ede{}
 commands.  These menu items, and their corresponding keybindings, are
 independent of the type of project you are actually working on.
 
-@node Quick Start, Creating a project, EDE Mode, top
+@node Quick Start, Creating a project, EDE Mode, Top
 @chapter Quick Start
 
 Once you have @ede{} enabled, you can create a project.  This chapter
@@ -439,7 +439,7 @@ C-c . R RET RET
 If your program takes command line arguments, you can type them in
 when it offers the command line you want to use to run your program.
 
-@node Creating a project, Modifying your project, Quick Start, top
+@node Creating a project, Modifying your project, Quick Start, Top
 @chapter Creating a project
 
 To create a new project, first visit a file that you want to include
@@ -497,7 +497,7 @@ the top-most project's makefile as a starting place for the build.  How
 the toplevel project handles subprojects in the build process is
 dependent on that project's type.
 
-@node Modifying your project, Building and Debugging, Creating a project, top
+@node Modifying your project, Building and Debugging, Creating a project, Top
 @chapter Modifying your project
 
 In this chapter, we describe the generic features for manipulating
@@ -678,7 +678,7 @@ block for ``configurations''.  Add a new named configuration here.
 To switch between different active configurations, modify the
 ``configuration default'' slot.
 
-@node Building and Debugging, Miscellaneous commands, Modifying your project, top
+@node Building and Debugging, Miscellaneous commands, Modifying your project, Top
 @chapter Building and Debugging
 
 @ede{} provides the following ``project-aware'' compilation and
@@ -697,7 +697,7 @@ Build a distribution file for your project.
 
 These commands are also available from the @samp{Development} menu.
 
-@node Miscellaneous commands, Extending EDE, Building and Debugging, top
+@node Miscellaneous commands, Extending EDE, Building and Debugging, Top
 @chapter Miscellaneous commands
 
 If you opt to go in and edit @ede{} project files directly---for
@@ -1093,7 +1093,7 @@ You can add your own locate tool but subclassing from
 methods.  See the code in @file{ede-locate.el} for GNU Global as a
 simple example.
 
-@node Extending EDE, GNU Free Documentation License, Miscellaneous commands, top
+@node Extending EDE, GNU Free Documentation License, Miscellaneous commands, Top
 @chapter Extending @ede{}
 
 This chapter is intended for users who want to write new parts or fix
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index b046eff3c08..740dfee41ed 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -1,10 +1,10 @@
 \input texinfo                  @c -*-texinfo-*-
 
+@set VERSION 0.3
+
 @setfilename ../../info/emacs-gnutls
 @settitle Emacs GnuTLS Integration @value{VERSION}
 
-@set VERSION 0.3
-
 @copying
 This file describes the Emacs GnuTLS integration.
 
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 58597599cdb..504940c5c6b 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -32,9 +32,9 @@ modify this GNU manual.''
 @sp 4
 @c The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{Eshell: The Emacs Shell}
 @ignore
 @sp 2
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index b92aacc88f0..5b06cc7f11a 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -35,8 +35,8 @@ modify this GNU manual.''
 @footnotestyle end
 
 @titlepage
-@title{EUDC Manual}
-@subtitle{The Emacs Unified Directory Client}
+@title EUDC Manual
+@subtitle The Emacs Unified Directory Client
 @author by Oscar Figueiredo
 @code{1.30b}
 
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index fb888941357..43ffab26c9b 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -87,8 +87,8 @@ how to present it.
 * Miscellaneous::               Forms mode messages and other remarks.
 * Error Messages::              List of error messages forms mode can produce.
 * Long Example::                A more complex control file example.
-* GNU Free Documentation License:: The license for this documentation.
 * Credits::                     Thanks everyone.
+* GNU Free Documentation License:: The license for this documentation.
 * Index::                       Index to this manual.
 @end menu
 @end ifnottex
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index d6904740778..911cdd3cd5f 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -1520,9 +1520,12 @@ Regex used to parse an etags entry: must have 3 subexps, corresponding,
 in order, to:
 
 @enumerate
-   The tag
-   The line
-   The character (point) at which the tag occurs
+@item
+The tag
+@item
+The line
+@item
+The character (point) at which the tag occurs
 @end enumerate
 
 @item hfy-index-file
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 737c186a5a4..bea130ccb43 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3027,7 +3027,7 @@ lines will be left alone by this command.
 Selects this line for global recalculation with @kbd{C-u C-c *}, but
 not for automatic recalculation.  Use this when automatic
 recalculation slows down editing too much.
-@item
+@item @
 Unmarked lines are exempt from recalculation with @kbd{C-u C-c *}.
 All lines that should be recalculated should be marked with @samp{#}
 or @samp{*}.
@@ -5050,7 +5050,7 @@ FILE         @r{The filename the entry is located in.}
 To create sparse trees and special lists with selection based on properties,
 the same commands are used as for tag searches (@pxref{Tag searches}).
 @table @kbd
-@orgcmdkkc{C-c / m,C-c \,org-match-sparse-tree}
+@orgcmdkkc{C-c / m,C-c @backslashchar{},org-match-sparse-tree}
 Create a sparse tree with all matching entries.  With a
 @kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
 @orgcmd{C-c a m,org-tags-view}
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 0749ceefd01..7c294591d0e 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -31,9 +31,9 @@ modify this GNU manual.''
 @sp 4
 @c The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{PCL-CVS---The Emacs Front-End to CVS}
 @ignore
 @sp 2
@@ -682,7 +682,7 @@ the fact that the buffer is a PCL-CVS buffer:
 These keys move the cursor one file forward, towards the end of the
 buffer (@code{cvs-mode-next-line}).@refill
 
-@itemx p
+@item p
 This key moves one file backward, towards the beginning of the buffer
 (@code{cvs-mode-previous-line}).
 @end table
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 6326f84420c..bb40a9f541d 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -2,11 +2,11 @@
 
 @include gnus-overrides.texi
 
+@set VERSION 0.1
+
 @setfilename ../../info/pgg
 @settitle PGG @value{VERSION}
 
-@set VERSION 0.1
-
 @copying
 This file describes PGG @value{VERSION}, an Emacs interface to various
 PGP implementations.
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index c5b95e4754a..0ee206b1a4d 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -4611,7 +4611,8 @@ prompt for values.  Possible values are:
 @example
 nil     @r{Never prompt for optional arguments}
 t       @r{Always prompt}
-maybe   @r{Prompt only if @code{reftex-citation} was called with C-u prefix arg}@end example
+maybe   @r{Prompt only if @code{reftex-citation} was called with C-u prefix arg}
+@end example
 Unnecessary empty optional arguments are removed before insertion into
 the buffer.  See @code{reftex-cite-cleanup-optional-args}.
 @end defopt
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index ede4d2a2382..dce90d06012 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -24,9 +24,9 @@ modify this GNU manual.''
 @end direntry
 
 @titlepage
-@title{Emacs SMTP Library}
-@subtitle{An Emacs package for sending mail via SMTP}
-@author{Simon Josefsson, Alex Schroeder}
+@title Emacs SMTP Library
+@subtitle An Emacs package for sending mail via SMTP
+@author Simon Josefsson, Alex Schroeder
 @page
 @vskip 0pt plus 1filll
 @insertcopying
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 2df3b4265d0..a683425868a 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -374,7 +374,7 @@ This release includes the full documentation and code for
 @value{tramp}, suitable for installation.  But Emacs (22 or later)
 includes @value{tramp} already, and there is a @value{tramp} package
 for XEmacs, as well.  So maybe it is easier to just use those.  But if
-you want the bleeding edge, read on@dots{...}
+you want the bleeding edge, read on@dots{}
 
 For the especially brave, @value{tramp} is available from Git.  The Git
 version is the latest version of the code and may contain incomplete
@@ -515,8 +515,8 @@ Method}.
 * Connection caching::          Reusing connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
-* Windows setup hints::         Issues with Cygwin ssh.
 * Auto-save and Backup::        Auto-save and Backup.
+* Windows setup hints::         Issues with Cygwin ssh.
 @end menu
 
 
@@ -1899,7 +1899,7 @@ of your (local or remote) host, you might need to adapt this. Example:
           "passwort" "Passwort"
           ;; Fran@,{c}ais
           "mot de passe" "Mot de passe") t)
-      ".*:
+      ".*:\0? *"))
 @end lisp
 
 In parallel, it might also be necessary to adapt
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index dbf83df46d3..01048d43dbf 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -677,9 +677,9 @@ Call last remembered keyboard macro.
 Suspend Emacs.
 @item Z Z
 Exit Emacs.
-@itemx Q
+@item Q
 Query replace.
-@itemx R
+@item R
 Replace.
 @end table
 
@@ -944,11 +944,11 @@ Scroll text of current window upward almost full screen.  You can go
 @kindex 002 @kbd{C-b} (@code{vip-scroll-back})
 Scroll text of current window downward almost full screen.  You can go
 @i{backward} in the buffer by this command (@code{vip-scroll-back}).
-@itemx C-d
+@item C-d
 @kindex 004 @kbd{C-d} (@code{vip-scroll-up})
 Scroll text of current window upward half screen.  You can go
 @i{down} in the buffer by this command (@code{vip-scroll-down}).
-@itemx C-u
+@item C-u
 @kindex 025 @kbd{C-u} (@code{vip-scroll-down})
 Scroll text of current window downward half screen.  You can go
 @i{up} in the buffer by this command (@code{vip-scroll-up}).
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 9a291dc19bb..9bcecf8e3de 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -3465,7 +3465,7 @@ Exchange point and mark.
 Exchange point and mark and go to the first CHAR on line.
 @item '<a-z>
 Go to specified Viper mark.
-@item
+@item `<a-z>
 Go to specified Viper mark and go to the first CHAR on line.
 @end table
 @kindex @kbd{m<a-z>}