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

fix(cli): improve end-of-file error in profiles file

Browse source 
Otherwise, the error message complains that the error originates from
core-cli.el.
This commit is contained in:
Henrik Lissner 2022-07-28 18:12:36 +02:00
parent 12b52909e3
commit 7eeec53c30
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/core-cli.el
View file

@ -46,15 +46,18 @@
(let ((profile (getenv "DOOMPROFILE")))
(when profile
(with-temp-buffer
(let ((coding-system-for-read 'utf-8-auto))
(insert-file-contents (expand-file-name "profiles.el" user-emacs-directory)))
(condition-case e
(dolist (var (or (cdr (assq (intern profile) (read (current-buffer))))
(user-error "No %S profile found" profile)))
(if (eq (car var) 'env)
(dolist (env (cdr var)) (setenv (car env) (cdr env)))
(set (car var) (cdr var))))
(error (error "Failed to parse profiles.el: %s" (error-message-string e)))))))
(let ((coding-system-for-read 'utf-8-auto)
(profile-file (expand-file-name "profiles.el" user-emacs-directory)))
(insert-file-contents profile-file)
(condition-case e
(dolist (var (or (cdr (assq (intern profile) (read (current-buffer))))
(progn (message "No %S profile found" profile)
(kill-emacs 3))))
(if (eq (car var) 'env)
(dolist (env (cdr var)) (setenv (car env) (cdr env)))
(set (car var) (cdr var))))
(end-of-file (signal 'end-of-file (list profile-file)))
(error (error "Parser error in profiles.el: %s" (error-message-string e))))))))
;; HACK Load `cl' and site files manually to prevent polluting logs and stdout
;; with deprecation and/or file load messages.