Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de
authorGlenn Morris <rgm@gnu.org>
Wed, 11 Jun 2014 19:33:14 +0000 (15:33 -0400)
committerGlenn Morris <rgm@gnu.org>
Wed, 11 Jun 2014 19:33:14 +0000 (15:33 -0400)
commitd29d249207dbb944ea93275ea8b8ea07f59c1e82
treeed19dc45de0f0822b038df22509ce111b2d5e4ac
parentb765f1fe83a0df149ad783f7dae8ea01f71e680d
parentdf907af0ddfc4282a6184f1b516cd92dbdf0093f
Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de
doc/misc/ChangeLog
doc/misc/Makefile.in
etc/NEWS
src/ChangeLog
src/xdisp.c