]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Apr 2016 15:50:47 +0000 (08:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Apr 2016 15:50:47 +0000 (08:50 -0700)
ca50981 Improve time zone documentation
c23c965 Prevent bootstrap autoload backup files
9344612 Disable multicolor fonts on OS X since they are not supported...
c41ce1c Capitalize “Universal Time” in documentation
10597c9 Don't use 'find-program'

1  2 
doc/emacs/cmdargs.texi
doc/lispref/os.texi
etc/NEWS
etc/PROBLEMS
lisp/calendar/solar.el
lisp/emacs-lisp/autoload.el
lisp/gnus/gnus-art.el
lisp/vc/add-log.el
src/editfns.c

Simple merge
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/editfns.c
Simple merge