From: Glenn Morris <rgm@gnu.org>
Date: Fri, 12 Jun 2015 00:47:45 +0000 (-0400)
Subject: ; * lisp/startup.el (normal-top-level): Fix previous change.
X-Git-Tag: emacs-25.0.90~1793
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/abeb7f3c5f5139c393057467cf85ffb8457aff30

; * lisp/startup.el (normal-top-level): Fix previous change.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index b638ed50cc..370e7aee77 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)))))