Merge from emacs-24; up to 2012-12-20T05:05:41Z!dmantipov@yandex.ru
authorGlenn Morris <rgm@gnu.org>
Sun, 17 Feb 2013 19:01:46 +0000 (11:01 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 17 Feb 2013 19:01:46 +0000 (11:01 -0800)
commita51e9ff76cc887e0e6df95ff2895d80e0c00e9b9
tree532d6ee96d6406d25eb389480cb142e87eea99ae
parent913274cbdc4a540f7c68dea45aec76845c50d94a
parentae11bda519726c8619f687645138f913b1027be3
Merge from emacs-24; up to 2012-12-20T05:05:41Z!dmantipov@yandex.ru
etc/TODO
lisp/ChangeLog
src/ChangeLog
src/xdisp.c