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

4 files changed, 23 insertions, 4 deletions

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