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

diff --cc doc/emacs/ChangeLog
Simple merge

diff --cc doc/lispref/ChangeLog
index e701f61,d0f1301..31c81e6
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,18 +1,18 @@@
 -2013-01-03  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
+ 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 --cc doc/lispref/display.texi
Simple merge

diff --cc doc/misc/ChangeLog
Simple merge

diff --cc doc/misc/ada-mode.texi
Simple merge

diff --cc doc/misc/eshell.texi
Simple merge

diff --cc doc/misc/eudc.texi
Simple merge

diff --cc doc/misc/pcl-cvs.texi
Simple merge

diff --cc doc/misc/reftex.texi
Simple merge

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc doc/misc/vip.texi
Simple merge

diff --cc doc/misc/viper.texi
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/xdisp.c
Simple merge