From: Glenn Morris <rgm@gnu.org>
Date: Thu, 21 Dec 2017 02:14:20 +0000 (-0500)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5989
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a415a97461cb10d2c6710871f90f57bd1ca34ec2;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

964dd38 Unbreak a fileio test on non-Mac OS X systems
---

a415a97461cb10d2c6710871f90f57bd1ca34ec2