From: Glenn Morris <rgm@gnu.org>
Date: Sat, 5 Jan 2013 21:18:01 +0000 (-0800)
Subject: Merge from emacs-24; up to 2012-12-07T08:13:49Z!dmantipov@yandex.ru
X-Git-Tag: emacs-24.3.90~173^2~7^2~396
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a2657fa3bedbd977f4e11fe030cb4a210c04ab4;p=emacs.git

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

7a2657fa3bedbd977f4e11fe030cb4a210c04ab4
diff --cc doc/lispref/ChangeLog
index e701f61c6b0,d0f130135d2..31c81e62ac1
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,18 +1,18 @@@
+ 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-03  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
 +2013-01-04  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
  
  	* hash.texi (Defining Hash): Fix typo.  (Bug#13345)