Merge from emacs-24; up to r117380
commitf5bfd4708b1114a2cb36c603c998e2c73634c854
authorGlenn Morris <rgm@gnu.org>
Wed, 16 Jul 2014 17:06:12 +0000 (16 13:06 -0400)
committerGlenn Morris <rgm@gnu.org>
Wed, 16 Jul 2014 17:06:12 +0000 (16 13:06 -0400)
tree3791318ea9320c241187a8c8af533eddf2200e6f
parent3aa39c06f5b47c482e1b2c9337963cf3cdae7435
parent3fea6eb0fbe843f5508d5d46d86fadc6045c9337
Merge from emacs-24; up to r117380
doc/lispintro/ChangeLog
doc/lispintro/emacs-lisp-intro.texi
etc/TODO
lisp/ChangeLog
src/ChangeLog
src/xdisp.c