From: Glenn Morris <rgm@gnu.org>
Date: Sat, 16 Dec 2017 20:18:45 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6018
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f74d811e805ebbcff9328e6cb8b5793f9d8c85ec;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

080f227331 (origin/emacs-26) Use utf-8-hfs-unix on macOS (Bug#29712)
---

f74d811e805ebbcff9328e6cb8b5793f9d8c85ec