Merge from emacs-24; up to 117698
commitc832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe
authorGlenn Morris <rgm@gnu.org>
Mon, 10 Nov 2014 07:39:35 +0000 (9 23:39 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 10 Nov 2014 07:39:35 +0000 (9 23:39 -0800)
tree98a77f1acdac589d1be95dea128af1af7e8dc286
parenteca1ea96559e04e18a62a61208d501c557dd4cab
parentedfdb22f674312389ccf5d5e37efa4d3f1516994
Merge from emacs-24; up to 117698
admin/ChangeLog
admin/unidata/Makefile.in
lisp/ChangeLog
lisp/erc/ChangeLog
lisp/startup.el
src/ChangeLog
src/fileio.c
src/nsterm.h
src/nsterm.m