Merge from emacs-24; up to 117634
commit526198228c5a1a0367fb15cb64165d7336eefc37
authorGlenn Morris <rgm@gnu.org>
Thu, 30 Oct 2014 05:15:28 +0000 (29 22:15 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 30 Oct 2014 05:15:28 +0000 (29 22:15 -0700)
tree0b3a23df7185b031a243f7a92a77e56032d7fc88
parent4fd1634dbdd87205b4be83b79f4f1d1026b9cae0
parent0204f208a50edc7b53f835cdbd4b2b65e1bbf2f8
Merge from emacs-24; up to 117634
17 files changed:
doc/emacs/ChangeLog
doc/emacs/frames.texi
doc/misc/ChangeLog
doc/misc/efaq.texi
doc/misc/eieio.texi
etc/NEWS.24
lisp/ChangeLog
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/cl-extra.el
lisp/erc/erc-track.el
lisp/progmodes/cc-defs.el
lisp/progmodes/cc-langs.el
lisp/progmodes/compile.el
lisp/startup.el
src/ChangeLog
src/dispnew.c
src/fileio.c