Merge from emacs-24; up to 2012-11-03T05:11:34Z!dmantipov@yandex.ru
authorGlenn Morris <rgm@gnu.org>
Sat, 3 Nov 2012 19:14:22 +0000 (12:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 3 Nov 2012 19:14:22 +0000 (12:14 -0700)
commitf58542e1510319921d1745e0ad647ed42b1157f2
tree7dce084101c1b16c1249eda33e03cbea15d08abc
parent7ccfb720b477df05042729e0e300bae5922f5120
parent92246540b0616afd90600aabbac964f5a0b544ca
Merge from emacs-24; up to 2012-11-03T05:11:34Z!dmantipov@yandex.ru
ChangeLog
doc/misc/ChangeLog
etc/NEWS
lisp/ChangeLog
msdos/sed2v2.inp
src/ChangeLog
src/xdisp.c