* startup.el (normal-top-level): Don't worry about setting

	default-directory to PWD if PWD is shorter.  And, if PWD isn't
	accurate, delete it.

1 files changed, 14 insertions, 11 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index f13aefec1a4..44b71681dda 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -126,18 +126,21 @@ directory name of the directory where the `.emacs' file was looked for.")
   (if command-line-processed
       (message "Back to top level.")
     (setq command-line-processed t)
-    ;; In presence of symlinks, switch to cleaner form of default directory.
     (if (not (eq system-type 'vax-vms))
-        (mapcar (function
-                 (lambda (var)
-                   (let ((value (getenv var)))
-                     (if (and value
-                              (< (length value) (length default-directory))
-                              (equal (file-attributes default-directory)
-                                     (file-attributes value)))
-                         (setq default-directory
-                               (file-name-as-directory value))))))
-                '("PWD" "HOME")))
+        (progn
+          ;; If the PWD environment variable isn't accurate, delete it.
+          (let ((pwd (getenv "PWD")))
+            (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
+                             (concat (file-name-as-directory pwd) "."))
+                            (file-attributes
+                             (concat (file-name-as-directory default-directory)
+                                     ".")))
+                     (setq process-environment
+                           (delete (concat "PWD=" pwd)
+                                   process-environment)))))))
     (setq default-directory (abbreviate-file-name default-directory))
     (unwind-protect
         (command-line)