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

dev: merge branch 'master'

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-08-01 10:19:30 -04:00
commit 53a3448c4f
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/doom-start.el
View file

@ -407,11 +407,10 @@ If RETURN-P, return the message as a string instead of displaying it."
(display-warning (display-warning
'initialization 'initialization
(format-message "\ (format-message "\
An error occurred while loading `%s':\n\n%s%s%s\n\n\ An error occurred while booting Doom Emacs:\n\n%s%s%s\n\n\
To ensure normal operation, you should investigate and remove the To ensure normal operation, you should investigate and remove the
cause of the error in your initialization file. Start Emacs with cause of the error in your Doom config files. Start Emacs with
the `--debug-init' option to view a complete error backtrace." the `--debug-init' option to view a complete error backtrace."
user-init-file
(get (car error) 'error-message) (get (car error) 'error-message)
(if (cdr error) ": " "") (if (cdr error) ": " "")
(mapconcat (lambda (s) (prin1-to-string s t)) (mapconcat (lambda (s) (prin1-to-string s t))

2
lisp/doom.el
View file

@ -201,7 +201,7 @@
"Current version of Doom Emacs core.") "Current version of Doom Emacs core.")
;; DEPRECATED: Remove these when the modules are moved out of core. ;; DEPRECATED: Remove these when the modules are moved out of core.
(defconst doom-modules-version "24.08.0-pre" (defconst doom-modules-version "24.09.0-pre"
"Current version of Doom Emacs.") "Current version of Doom Emacs.")
(defvar doom-init-time nil (defvar doom-init-time nil