From 3441b5a4250063cd3c7fbecb1d85f4eecf2af319 Mon Sep 17 00:00:00 2001 From: Pete Williamson Date: Fri, 3 Apr 2015 16:48:34 -0700 Subject: [PATCH] Fix file recursion problem for NaCl by using the ms-dos check. --- ChangeLog | 5 +++++ lisp/files.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7746605..97e55cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-04-03 Pete Williamson (tiny-change) + + Fix .emacs and .emacs.d/init file recursion problem for NaCl. + * lisp/files.el: Add NaCl to the exception list ms-dos uses. + 2015-04-03 Paul Eggert Port 'configure' to clang 3.5 diff --git a/lisp/files.el b/lisp/files.el index 42b00ac..0fdf004 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1192,7 +1192,7 @@ containing it, until no links are left at any level. (setq dirfile (directory-file-name dir)) ;; If these are equal, we have the (or a) root directory. (or (string= dir dirfile) - (and (memq system-type '(windows-nt ms-dos cygwin)) + (and (memq system-type '(windows-nt ms-dos cygwin nacl)) (eq (compare-strings dir 0 nil dirfile 0 nil t) t)) ;; If this is the same dir we last got the truename for, ;; save time--don't recalculate. -- 2.2.0.rc0.207.ga3a616c