Merge from emacs-24; up to 2014-06-26T21:51:25Z!rgm@gnu.org.
commit8afcf7e9d72d4d4173a00151dd8f2ba1866000c1
authorEli Zaretskii <eliz@gnu.org>
Fri, 1 Aug 2014 13:10:07 +0000 (1 16:10 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 1 Aug 2014 13:10:07 +0000 (1 16:10 +0300)
tree0f8439faf6ec04103c1741aa1edbc5d5a939ff19
parent4844e0422f7d318775cc7fce7845c0c568bd7ca3
parenteef5843c3458907e4bef35be10d46fea99f412f9
Merge from emacs-24; up to 2014-06-26T21:51:25Z!rgm@gnu.org.
lisp/ChangeLog
src/ChangeLog
src/macros.c
src/xdisp.c