Merge from origin/emacs-25
commitc5532f5a5c304134ecb0367997402c2935d6030c
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:40:43 +0000 (7 12:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:40:43 +0000 (7 12:40 -0800)
treecff0c6b05099fcaa51dae8e1c042528cdb318925
parent32b46fc82f1275d8e0c86340546db366dea48c8c
parent39809036d39711fb5d01105739dd301ac046b151
Merge from origin/emacs-25

3980903 ; Update ChangeLog.2, etc/AUTHORS and ldef-boot.el for Emacs ...
5878abf Fix 'expand-file-name' during startup on MS-Windows
ChangeLog.2
doc/lispref/files.texi
lisp/files.el
lisp/international/mule-cmds.el
src/emacs.c
src/fileio.c
src/w32.c
src/w32.h
src/w32term.c