From 6d0639d101fe628965967884359bed14e955e498 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 21 Jun 2022 23:33:07 +0200 Subject: [PATCH] fix(lib): avoid doom-load-session on restart if not in Doom If for some reason you restart into another config (or startup fails for one reason or another), don't call doom-load-session and break things. --- core/autoload/sessions.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/autoload/sessions.el b/core/autoload/sessions.el index 13e648cea..589622a95 100644 --- a/core/autoload/sessions.el +++ b/core/autoload/sessions.el @@ -133,8 +133,10 @@ switch." ;; arguments at all. Should be fixed upstream, but restart-emacs seems to ;; be unmaintained. (with-temp-file tmpfile - (print `(progn (add-hook 'window-setup-hook #'doom-load-session 100) - (delete-file ,tmpfile)) + (print `(progn + (when (boundp 'doom-version) + (add-hook 'window-setup-hook #'doom-load-session 100)) + (delete-file ,tmpfile)) (current-buffer))) (restart-emacs (append (if debug (list "--debug-init"))