emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-27 362ca83: Let Emacs start even if curdir is inaccessible


From: Paul Eggert
Subject: emacs-27 362ca83: Let Emacs start even if curdir is inaccessible
Date: Mon, 17 Aug 2020 19:22:16 -0400 (EDT)

branch: emacs-27
commit 362ca83a3b9d74c51ac325a6490551272aa25f9a
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    Let Emacs start even if curdir is inaccessible
    
    * lisp/startup.el (normal-top-level): Also delete PWD if
    file-attributes fails for either $PWD or default-directory,
    instead of failing out of the top level.
    This fixes a regression from Emacs 26 (Bug#42903).
---
 lisp/startup.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index bff1000..364689c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -649,11 +649,12 @@ It is the default value of the variable `top-level'."
           ;; Use FOO/., so that if FOO is a symlink, file-attributes
           ;; describes the directory linked to, not FOO itself.
           (or (and default-directory
-                   (equal (file-attributes
-                      (concat (file-name-as-directory pwd) "."))
-                     (file-attributes
-                      (concat (file-name-as-directory default-directory)
-                              "."))))
+                   (ignore-errors
+                     (equal (file-attributes
+                             (concat (file-name-as-directory pwd) "."))
+                            (file-attributes
+                             (concat (file-name-as-directory default-directory)
+                                     ".")))))
               (setq process-environment
                     (delete (concat "PWD=" pwd)
                             process-environment)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]