From: Alan Third <alan@idiocy.org>
Date: Sat, 16 Dec 2017 17:13:34 +0000 (+0000)
Subject: Use utf-8-hfs-unix on macOS (Bug#29712)
X-Git-Tag: emacs-26.0.91~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=080f227;p=emacs.git

Use utf-8-hfs-unix on macOS (Bug#29712)

This is a quick fix for the Emacs 26 release. Do not merge to master.

* test/src/fileio-tests.el (fileio-tests--symlink-failure): Override
file-name-coding-system to utf-8-hfs-unix to prevent test failure.
---

diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index 01c280d2752..6962b684565 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -29,7 +29,8 @@
 
 (defun fileio-tests--symlink-failure ()
   (let* ((dir (make-temp-file "fileio" t))
-         (link (expand-file-name "link" dir)))
+         (link (expand-file-name "link" dir))
+         (file-name-coding-system 'utf-8-hfs-unix))
     (unwind-protect
         (let (failure
               (char 0))