Merge from emacs-24; up to 117656
commitf08b547591c28167d6980336915150e83158daef
authorGlenn Morris <rgm@gnu.org>
Sat, 1 Nov 2014 18:05:30 +0000 (1 11:05 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 1 Nov 2014 18:05:30 +0000 (1 11:05 -0700)
tree2bb9a84ce8745a3adb58e2db0b759753c921e501
parent368123bc5416b64c6883f12a3255bba2aa13dba4
parent02c48c4850c8518b88a59cab17f32a339c94fb8c
Merge from emacs-24; up to 117656
15 files changed:
admin/ChangeLog
admin/notes/repo
lisp/ChangeLog
lisp/Makefile.in
lisp/emulation/cua-base.el
lisp/progmodes/compile.el
lisp/progmodes/vhdl-mode.el
lisp/simple.el
src/ChangeLog
src/emacs.c
src/macfont.m
src/nsfns.m
src/nsterm.h
src/nsterm.m
src/xdisp.c