procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PWD startup checking with symlinks

Browse source 
* lisp/startup.el (normal-top-level): Do not put "." after "/";
it’s not needed and with current file-name-as-directory it does
the wrong thing if PWD is a symlink.
This commit is contained in:
Paul Eggert 2020-08-26 10:53:32 -07:00
parent dfeb059312
commit ff864be694
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/startup.el
View file

@ -642,16 +642,13 @@ It is the default value of the variable `top-level'."
(list (default-value 'user-full-name)))
;; 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.
(and pwd
(or (and default-directory
(ignore-errors
(equal (file-attributes
(concat (file-name-as-directory pwd) "."))
(file-name-as-directory pwd))
(file-attributes
(concat (file-name-as-directory default-directory)
".")))))
(file-name-as-directory default-directory)))))
(setq process-environment
(delete (concat "PWD=" pwd)
process-environment)))))