Merge from emacs-24; up to 117698
commitafb8ff4e41602bf905ebd61077021f02f220bcd6
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)
tree717dddb8df28b1ab26104627a018cbdaf72015f4
parent3c6f2f34e5c92dff09f5cb995e3c4478b00beabd
parentb3810a6b6c8054311cdc432df318899b8202026e
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