Merge from emacs-24; up to 2012-12-14T21:27:39Z!rgm@gnu.org
commit078891963d172f00c9866427683e486984d2d0e1
authorGlenn Morris <rgm@gnu.org>
Fri, 8 Feb 2013 17:23:24 +0000 (8 09:23 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 8 Feb 2013 17:23:24 +0000 (8 09:23 -0800)
treeab82d4e6068776b226a5615688e1af1da62e3f30
parent7f526211ba8dcdc6f950a5d9857e8b9247b3cfb1
parent90790560581cfcb7728e1ce2094b4f42dd381192
Merge from emacs-24; up to 2012-12-14T21:27:39Z!rgm@gnu.org
doc/lispref/ChangeLog
doc/misc/ChangeLog
doc/misc/eshell.texi
etc/TODO
src/xdisp.c