Merge from emacs-24; up to 117689
commit92c3e7f330b0c3686a4bbddde8718eef3d927b1d
authorGlenn Morris <rgm@gnu.org>
Sat, 8 Nov 2014 21:32:10 +0000 (8 13:32 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 8 Nov 2014 21:32:10 +0000 (8 13:32 -0800)
tree233ee137dd4f42ed5de6c34017c288611e64b024
parent74cdee263230d81879533fc22c099492c83b7773
parent023a32b1ef07e3a0172c4943480cc09027b5ba02
Merge from emacs-24; up to 117689
lisp/ChangeLog
lisp/emacs-lisp/bytecomp.el
src/ChangeLog
src/nsterm.m