emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(cli): inability to find user-emacs-directory (part 2)

Browse source 
I misunderstood the issue in 1081588. `user-emacs-directory` is never
nil, even in batch sessions. Instead, it is simply set to the wrong path
in cases where Doom is deployed to a non-standard location. It's needed
to change it there, but never in interactive sessions.

Fix: #6777
Amend: 108158876c
This commit is contained in:
Henrik Lissner 2022-09-17 15:24:20 +02:00
parent 1a6524cecc
commit f748a5d15d
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
early-init.el
View file

@ -45,21 +45,21 @@
;; notable saving in startup time. This let-binding is just a stopgap though, ;; notable saving in startup time. This let-binding is just a stopgap though,
;; a more complete version of this optimization can be found in lisp/doom.el. ;; a more complete version of this optimization can be found in lisp/doom.el.
(let (file-name-handler-alist) (let (file-name-handler-alist)
;; FIX: If this file was loaded via -batch or bin/doom, then
;; `user-emacs-directory' won't be set. As a starting point, let's assume
;; it's the directory this early-init.el file lives in.
(unless user-emacs-directory
(setq user-emacs-directory (file-name-directory (file-truename load-file-name))))
;; FEAT: First, we process --init-directory and --profile to detect what ;; FEAT: First, we process --init-directory and --profile to detect what
;; `user-emacs-directory' to load from. I avoid using ;; `user-emacs-directory' to load from. I avoid using
;; `command-switch-alist' to process --profile and --init-directory because ;; `command-switch-alist' to process --profile and --init-directory because
;; it is processed too late to change `user-emacs-directory' in time. ;; it is processed too late to change `user-emacs-directory' in time.
;; REVIEW: Backported from Emacs 29. Remove when 28 support is dropped. ;; REVIEW: Backported from Emacs 29. Remove when 28 support is dropped.
(let ((initdir (or (cadr (member "--init-directory" command-line-args)) (let ((initdir (or (cadr (member "--init-directory" command-line-args))
(getenv-internal "EMACSDIR")))) (getenv-internal "EMACSDIR"))))
(when initdir (if (null initdir)
;; FIX: If we've been loaded directly (via 'emacs -batch -l
;; early-init.el') or by a doomscript (like bin/doom), and Doom is
;; in a non-standard location (and/or Chemacs is used), then
;; `user-emacs-directory' will be wrong.
(when noninteractive
(setq user-emacs-directory
(file-name-directory (file-truename load-file-name))))
;; FIX: Discard the switch to prevent "invalid option" errors later. ;; FIX: Discard the switch to prevent "invalid option" errors later.
(push (cons "--init-directory" (lambda (_) (pop argv))) command-switch-alist) (push (cons "--init-directory" (lambda (_) (pop argv))) command-switch-alist)
(setq user-emacs-directory (expand-file-name initdir)))) (setq user-emacs-directory (expand-file-name initdir))))