; Merge from origin/emacs-26

The following commit was skipped:

964dd38 Unbreak a fileio test on non-Mac OS X systems
This commit is contained in:
Glenn Morris 2017-12-20 21:14:20 -05:00
commit a415a97461

Diff content is not available