diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-06-11 20:47:45 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-06-11 20:47:45 -0400 |
| commit | abeb7f3c5f5139c393057467cf85ffb8457aff30 (patch) | |
| tree | 644c7c54fa1fcaedd96066897ef90fe764cf74d7 /lisp/startup.el | |
| parent | ebbc6a4782c279527c52d6b1d8b379517aeec2d5 (diff) | |
| download | emacs-abeb7f3c5f5139c393057467cf85ffb8457aff30.tar.gz | |
; * lisp/startup.el (normal-top-level): Fix previous change.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index b638ed50cc6..370e7aee771 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))))) |