[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 964dd38: Unbreak a fileio test on non-Mac OS X sy
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 964dd38: Unbreak a fileio test on non-Mac OS X systems |
Date: |
Wed, 20 Dec 2017 14:28:20 -0500 (EST) |
branch: emacs-26
commit 964dd38c8f71d13ab33ef1ba1f1e63c166c13fb6
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Unbreak a fileio test on non-Mac OS X systems
* test/src/fileio-tests.el (fileio-tests--symlink-failure):
Don't use an undefined coding system.
; No need to merge to master, since breaking commit wasn't merged.
---
test/src/fileio-tests.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index 6962b68..5ed6791 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -30,7 +30,10 @@
(defun fileio-tests--symlink-failure ()
(let* ((dir (make-temp-file "fileio" t))
(link (expand-file-name "link" dir))
- (file-name-coding-system 'utf-8-hfs-unix))
+ (file-name-coding-system (if (and (eq system-type 'darwin)
+ (featurep 'ucs-normalize))
+ 'utf-8-hfs-unix
+ file-name-coding-system)))
(unwind-protect
(let (failure
(char 0))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 964dd38: Unbreak a fileio test on non-Mac OS X systems,
Glenn Morris <=