From: Pete Williamson Date: Sun, 5 Apr 2015 03:18:45 +0000 (-0700) Subject: Fix .emacs and .emacs.d/init file recursion problem for NaCl X-Git-Tag: emacs-25.0.90~2564^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b79bcfd34f726c864943edd0964eea72d4f0aec5;p=emacs.git Fix .emacs and .emacs.d/init file recursion problem for NaCl * files.el (file-truename): Add NaCl to the exception list ms-dos uses. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 694b34691de..7fa39b46727 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-05 Pete Williamson (tiny-change) + + Fix .emacs and .emacs.d/init file recursion problem for NaCl + * files.el (file-truename): Add NaCl to the exception list ms-dos uses. + 2015-04-04 Alan Mackenzie * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change diff --git a/lisp/files.el b/lisp/files.el index 42b00accbd8..0fdf0048ac4 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.