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

Minor reformatting & docstring revision in core.el

Browse source
This commit is contained in:
Henrik Lissner 2018-06-13 22:16:08 +02:00
parent b6f9bc9675
commit 933023d779
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/core.el
View file

@ -78,7 +78,7 @@ file.")
;; ;;
;; State variables ;; Doom core variables
;; ;;
(defvar doom-init-p nil (defvar doom-init-p nil
@ -94,14 +94,6 @@ Doom was setup, which can cause problems.")
(defvar doom-site-load-path load-path (defvar doom-site-load-path load-path
"The starting load-path, before it is altered by `doom-initialize'.") "The starting load-path, before it is altered by `doom-initialize'.")
(defvar doom--refreshed-p nil)
(defvar doom--stage 'init)
;;
;; Doom hooks
;;
(defvar doom-init-hook nil (defvar doom-init-hook nil
"Hooks run after all init.el files are loaded, including your private and all "Hooks run after all init.el files are loaded, including your private and all
module init.el files, but before their config.el files are loaded.") module init.el files, but before their config.el files are loaded.")
@ -114,6 +106,11 @@ else (except for `window-setup-hook').")
(defvar doom-reload-hook nil (defvar doom-reload-hook nil
"A list of hooks to run when `doom//reload-load-path' is called.") "A list of hooks to run when `doom//reload-load-path' is called.")
(defvar doom--last-emacs-file (concat doom-local-dir "emacs-version.el"))
(defvar doom--last-emacs-version nil)
(defvar doom--refreshed-p nil)
(defvar doom--stage 'init)
;; ;;
;; Optimize startup ;; Optimize startup
@ -249,11 +246,9 @@ with functions that require it (like modeline segments)."
;; Bootstrap helpers ;; Bootstrap helpers
;; ;;
(defvar doom--last-emacs-file (concat doom-local-dir "emacs-version.el"))
(defvar doom--last-emacs-version nil)
(defun doom-ensure-same-emacs-version-p () (defun doom-ensure-same-emacs-version-p ()
"Do an Emacs version check and set `doom-emacs-changed-p' if it has changed." "Check if the running version of Emacs has changed and set
`doom-emacs-changed-p' if it has."
(if (load doom--last-emacs-file 'noerror 'nomessage 'nosuffix) (if (load doom--last-emacs-file 'noerror 'nomessage 'nosuffix)
(setq doom-emacs-changed-p (setq doom-emacs-changed-p
(not (equal emacs-version doom--last-emacs-version))) (not (equal emacs-version doom--last-emacs-version)))
@ -264,7 +259,8 @@ with functions that require it (like modeline segments)."
((y-or-n-p ((y-or-n-p
(format (format
(concat "Your version of Emacs has changed from %s to %s, which may cause incompatibility\n" (concat "Your version of Emacs has changed from %s to %s, which may cause incompatibility\n"
"issues. Please run `bin/doom compile :plugins` afterwards to resolve any problems.\n\n" "issues. If you run into errors, run `bin/doom compile :plugins` or reinstall your\n"
"plugins to resolve them.\n\n"
"Continue?") "Continue?")
doom--last-emacs-version doom--last-emacs-version
emacs-version)) emacs-version))