Merge from emacs-24; up to r117485
commit4800bfcd14f33fd4667babec775b7b7916f2bfe3
authorGlenn Morris <rgm@gnu.org>
Mon, 8 Sep 2014 06:00:58 +0000 (7 23:00 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 8 Sep 2014 06:00:58 +0000 (7 23:00 -0700)
treee788612f17dd7cc875c0f36e9fd49a6e54fda000
parent7f73df1b646f23b5d0afb827b81eea2f87ab475b
parenta732b06dbdfcdf4eea479b7172647b9b35a57818
Merge from emacs-24; up to r117485
admin/ChangeLog
doc/lispref/ChangeLog
doc/lispref/functions.texi
lisp/ChangeLog
lisp/calendar/calendar.el
lisp/subr.el
src/ChangeLog
src/data.c
src/dispnew.c
src/sysdep.c