[Emacs-diffs] master abeb7f3: ; * lisp/startup.el (normal-top-level): Fix previous change.

[Glenn Morris]

branch: master
commit abeb7f3c5f5139c393057467cf85ffb8457aff30
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    ; * lisp/startup.el (normal-top-level): Fix previous change.
---
 lisp/startup.el |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

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