refactor: adopt CalVer and reorganize core.el

Doom is adopting CalVer (starting at 21.12) and, later, I'll move Doom's
core out to a separate repo, where it'll stay with SemVer (starting at
3.0).

core/autoload/debug.el

@@ -222,12 +222,16 @@ ready to be pasted in a bug report on github."
 
 ;;;###autoload
 (defun doom/version ()
-  "Display the current version of Doom & Emacs, including the current Doom
+  "Display the current version and ocmit of Doom & Emacs."
-branch and commit."
   (interactive)
-  (let ((default-directory doom-core-dir))
+  (let ((default-directory doom-emacs-dir))
-    (print! "Doom v%s (%s)"
+    (print! "Doom emacs\tv%-15s %s"
             doom-version
+            (or (cdr (doom-call-process "git" "log" "-1" "--format=%D %h %ci"))
+                "n/a")))
+  (let ((default-directory doom-core-dir))
+    (print! "Doom core\tv%-15s %s"
+            doom-core-version
             (or (cdr (doom-call-process "git" "log" "-1" "--format=%D %h %ci"))
                 "n/a"))))
 

core/core.el

@@ -1,31 +1,8 @@
 ;;; core.el --- the heart of the beast -*- lexical-binding: t; -*-
 
-;;
+(when (< emacs-major-version 27)
-;;; Initialize internal state
+  (error "Detected Emacs %s. Minimum supported version is 27.1."
-
+         emacs-version))
-(defconst doom-version "3.0.0-alpha"
-  "Current version of Doom Emacs.")
-
-(defvar doom-init-p nil
-  "Non-nil if Doom has been initialized.")
-
-(defvar doom-init-time nil
-  "The time it took, in seconds, for Doom Emacs to initialize.")
-
-(defvar doom-debug-p (or (getenv-internal "DEBUG") init-file-debug)
-  "If non-nil, Doom will log more.
-
-Use `doom-debug-mode' to toggle it. The --debug-init flag and setting the DEBUG
-envvar will enable this at startup.")
-
-(defconst doom-interactive-p (not noninteractive)
-  "If non-nil, Emacs is in interactive mode.")
-
-(defconst EMACS28+   (> emacs-major-version 27))
-(defconst IS-MAC     (eq system-type 'darwin))
-(defconst IS-LINUX   (eq system-type 'gnu/linux))
-(defconst IS-WINDOWS (memq system-type '(cygwin windows-nt ms-dos)))
-(defconst IS-BSD     (or IS-MAC (eq system-type 'berkeley-unix)))
 
 ;; Ensure Doom's core libraries are visible for loading
 (add-to-list 'load-path (file-name-directory load-file-name))
@@ -36,26 +13,43 @@ envvar will enable this at startup.")
   (unless (get var 'initial-value)
     (put var 'initial-value (default-value var))))
 
-;; Unix tools look for HOME, but this is normally not defined on Windows.
+;; Just the... bear necessities~
-(when (and IS-WINDOWS (null (getenv-internal "HOME")))
+(require 'core-lib)
-  (setenv "HOME" (getenv "USERPROFILE"))
-  (setq abbreviated-home-dir nil))
 
-;; Contrary to what many Emacs users have in their configs, you don't need more
-;; than this to make UTF-8 the default coding system:
-(set-language-environment "UTF-8")
-;; ...but the clipboard's on Windows could be in another encoding (likely
-;; utf-16), so let Emacs/the OS decide what to use there.
-(unless IS-WINDOWS
-  (setq selection-coding-system 'utf-8)) ; with sugar on top
 
-;;; Custom error types
+;;
-(define-error 'doom-error "Error in Doom Emacs core")
+;;; Initialize internal state
-(define-error 'doom-hook-error "Error in a Doom startup hook" 'doom-error)
+
-(define-error 'doom-autoload-error "Error in Doom's autoloads file" 'doom-error)
+(defgroup doom nil
-(define-error 'doom-module-error "Error in a Doom module" 'doom-error)
+  "An Emacs framework for the stubborn martian hacker."
-(define-error 'doom-private-error "Error in private config" 'doom-error)
+  :link '(url-link "https://doomemacs.org"))
-(define-error 'doom-package-error "Error with packages" 'doom-error)
+
+(defconst doom-version "21.12.0-alpha"
+  "Current version of Doom Emacs.")
+
+(defconst doom-core-version "3.0.0-alpha"
+  "Current version of Doom Emacs core.")
+
+(defvar doom-debug-p (or (getenv-internal "DEBUG") init-file-debug)
+  "If non-nil, Doom will log more.
+
+Use `doom-debug-mode' to toggle it. The --debug-init flag and setting the DEBUG
+envvar will enable this at startup.")
+
+(defvar doom-init-p nil
+  "Non-nil if Doom has been initialized.")
+
+(defvar doom-init-time nil
+  "The time it took, in seconds, for Doom Emacs to initialize.")
+
+(defconst doom-interactive-p (not noninteractive)
+  "If non-nil, Emacs is in interactive mode.")
+
+(defconst EMACS28+   (> emacs-major-version 27))
+(defconst IS-MAC     (eq system-type 'darwin))
+(defconst IS-LINUX   (eq system-type 'gnu/linux))
+(defconst IS-WINDOWS (memq system-type '(cygwin windows-nt ms-dos)))
+(defconst IS-BSD     (or IS-MAC (eq system-type 'berkeley-unix)))
 
 
 ;;
@@ -71,10 +65,9 @@ envvar will enable this at startup.")
   "The root directory for Doom's modules. Must end with a slash.")
 
 (defconst doom-local-dir
-  (let ((localdir (getenv-internal "DOOMLOCALDIR")))
+  (if-let (localdir (getenv-internal "DOOMLOCALDIR"))
-    (if localdir
       (expand-file-name (file-name-as-directory localdir))
-      (concat doom-emacs-dir ".local/")))
+    (concat doom-emacs-dir ".local/"))
   "Root directory for local storage.
 
 Use this as a storage location for this system's installation of Doom Emacs.
@@ -97,15 +90,14 @@ Use this for files that change often, like cache files. Must end with a slash.")
   "Where Doom's documentation files are stored. Must end with a slash.")
 
 (defconst doom-private-dir
-  (let ((doomdir (getenv-internal "DOOMDIR")))
+  (if-let (doomdir (getenv-internal "DOOMDIR"))
-    (if doomdir
       (expand-file-name (file-name-as-directory doomdir))
     (or (let ((xdgdir
                (expand-file-name "doom/"
                                  (or (getenv-internal "XDG_CONFIG_HOME")
                                      "~/.config"))))
           (if (file-directory-p xdgdir) xdgdir))
-          "~/.doom.d/")))
+        "~/.doom.d/"))
   "Where your private configuration is placed.
 
 Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar;
@@ -127,6 +119,17 @@ which is loaded at startup (if it exists). This is helpful if Emacs can't
 users).")
 
 
+;;
+;;; Custom error types
+
+(define-error 'doom-error "Error in Doom Emacs core")
+(define-error 'doom-hook-error "Error in a Doom startup hook" 'doom-error)
+(define-error 'doom-autoload-error "Error in Doom's autoloads file" 'doom-error)
+(define-error 'doom-module-error "Error in a Doom module" 'doom-error)
+(define-error 'doom-private-error "Error in private config" 'doom-error)
+(define-error 'doom-package-error "Error with packages" 'doom-error)
+
+
 ;;
 ;;; Custom hooks
 
@@ -173,16 +176,16 @@ users).")
           (native-comp-always-compile . comp-always-compile)
           (native-comp-verbose . comp-verbose)
           (native-comp-debug . comp-debug)
-          (native-comp-speed . comp-speed))))
+          (native-comp-speed . comp-speed)))
 
   ;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged
   ;; when upgrading Doom).
   (when (boundp 'native-comp-eln-load-path)
-  (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/")))
+    (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/"))))
 
 (with-eval-after-load 'comp
   ;; HACK Disable native-compilation for some troublesome packages
-  (mapc (apply-partially #'add-to-list 'native-comp-deferred-compilation-deny-list)
+  (mapc (doom-partial #'add-to-list 'native-comp-deferred-compilation-deny-list)
         (let ((local-dir-re (concat "\\`" (regexp-quote doom-local-dir))))
           (list (concat "\\`" (regexp-quote doom-autoloads-file) "\\'")
                 (concat local-dir-re ".*/evil-collection-vterm\\.el\\'")
@@ -191,45 +194,6 @@ users).")
                 (concat local-dir-re ".*/jupyter-channel\\.el\\'")))))
 
 
-;;
-;;; Core libraries
-
-;; Just the... bear necessities~
-(require 'subr-x)
-(require 'cl-lib)
-(require 'core-lib)
-
-
-;;
-;;; A quieter startup
-
-;; Disable warnings from legacy advice system. They aren't useful, and what can
-;; we do about them, besides changing packages upstream?
-(setq ad-redefinition-action 'accept)
-
-;; Reduce debug output, well, unless we've asked for it.
-(setq debug-on-error doom-debug-p
-      jka-compr-verbose doom-debug-p)
-
-;; Get rid of "For information about GNU Emacs..." message at startup, unless
-;; we're in a daemon session where it'll say "Starting Emacs daemon." instead,
-;; which isn't so bad.
-(unless (daemonp)
-  (advice-add #'display-startup-echo-area-message :override #'ignore))
-
-;; Reduce *Message* noise at startup. An empty scratch buffer (or the dashboard)
-;; is more than enough.
-(setq inhibit-startup-message t
-      inhibit-startup-echo-area-message user-login-name
-      inhibit-default-init t
-      ;; Shave seconds off startup time by starting the scratch buffer in
-      ;; `fundamental-mode', rather than, say, `org-mode' or `text-mode', which
-      ;; pull in a ton of packages. `doom/open-scratch-buffer' provides a better
-      ;; scratch buffer anyway.
-      initial-major-mode 'fundamental-mode
-      initial-scratch-message nil)
-
-
 ;;
 ;;; Don't litter `doom-emacs-dir'
 
@@ -255,7 +219,61 @@ config.el instead."
 
 
 ;;
-;;; Optimizations
+;;; MODE-local-vars-hook
+
+;; File+dir local variables are initialized after the major mode and its hooks
+;; have run. If you want hook functions to be aware of these customizations, add
+;; them to MODE-local-vars-hook instead.
+(defvar doom-inhibit-major-mode-post-hooks nil)
+
+(defun doom-run-local-var-hooks-h ()
+  "Run MODE-local-vars-hook after local variables are initialized."
+  (unless doom-inhibit-major-mode-post-hooks
+    (setq-local doom-inhibit-major-mode-post-hooks t)
+    (when-let (hk (intern-soft (format "%s-local-vars-hook" major-mode)))
+      (message "%S is deprecated, use after-%s-hook instead"
+               hk major-mode)
+      (doom-run-hooks hk))
+    (doom-run-hooks (intern-soft (format "after-%s-hook" major-mode)))))
+
+;; If the user has disabled `enable-local-variables', then
+;; `hack-local-variables-hook' is never triggered, so we trigger it at the end
+;; of `after-change-major-mode-hook':
+(defun doom-run-local-var-hooks-maybe-h ()
+  "Run `doom-run-local-var-hooks-h' if `enable-local-variables' is disabled."
+  (unless enable-local-variables
+    (doom-run-local-var-hooks-h)))
+
+
+;;
+;;; Reasonable defaults
+
+;; Emacs is essentially one huge security vulnerability, what with all the
+;; dependencies it pulls in from all corners of the globe. Let's try to be at
+;; least a little more discerning.
+(setq gnutls-verify-error (and (fboundp 'gnutls-available-p)
+                               (gnutls-available-p)
+                               (not (getenv-internal "INSECURE")))
+      gnutls-algorithm-priority
+      (when (boundp 'libgnutls-version)
+        (concat "SECURE128:+SECURE192:-VERS-ALL"
+                (if (and (not IS-WINDOWS)
+                         (>= libgnutls-version 30605))
+                    ":+VERS-TLS1.3")
+                ":+VERS-TLS1.2"))
+      ;; `gnutls-min-prime-bits' is set based on recommendations from
+      ;; https://www.keylength.com/en/4/
+      gnutls-min-prime-bits 3072
+      tls-checktrust gnutls-verify-error
+      ;; Emacs is built with `gnutls' by default, so `tls-program' would not be
+      ;; used in that case. Otherwise, people have reasons to not go with
+      ;; `gnutls', we use `openssl' instead. For more details, see
+      ;; https://redd.it/8sykl1
+      tls-program '("openssl s_client -connect %h:%p -CAfile %t -nbio -no_ssl3 -no_tls1 -no_tls1_1 -ign_eof"
+                    "gnutls-cli -p %p --dh-bits=3072 --ocsp --x509cafile=%t \
+--strict-tofu --priority='SECURE192:+SECURE128:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3' %h"
+                    ;; compatibility fallbacks
+                    "gnutls-cli -p %p %h"))
 
 ;; A second, case-insensitive pass over `auto-mode-alist' is time wasted, and
 ;; indicates misconfiguration (don't rely on case insensitivity for file names).
@@ -323,10 +341,14 @@ config.el instead."
 
 ;; Performance on Windows is considerably worse than elsewhere. We'll need
 ;; everything we can get.
-(when IS-WINDOWS
+(when (boundp 'w32-get-true-file-attributes)
   (setq w32-get-true-file-attributes nil   ; decrease file IO workload
         w32-pipe-read-delay 0              ; faster IPC
-        w32-pipe-buffer-size (* 64 1024))) ; read more at a time (was 4K)
+        w32-pipe-buffer-size (* 64 1024))  ; read more at a time (was 4K)
+
+  ;; The clipboard on Windows could be in another encoding (likely utf-16), so
+  ;; let Emacs/the OS decide what to use there.
+  (setq selection-coding-system 'utf-8))
 
 ;; Remove command line options that aren't relevant to our current OS; means
 ;; slightly less to process at startup.
@@ -346,61 +368,33 @@ config.el instead."
 
 
 ;;
-;;; Security
+;;; Reasonable defaults for interactive sessions
 
-;; Emacs is essentially one huge security vulnerability, what with all the
+;; Disable warnings from legacy advice system. They aren't useful, and what can
-;; dependencies it pulls in from all corners of the globe. Let's try to be at
+;; we do about them, besides changing packages upstream?
-;; least a little more discerning.
+(setq ad-redefinition-action 'accept)
-(setq gnutls-verify-error (not (getenv-internal "INSECURE"))
-      gnutls-algorithm-priority
-      (when (boundp 'libgnutls-version)
-        (concat "SECURE128:+SECURE192:-VERS-ALL"
-                (if (and (not IS-WINDOWS)
-                         (>= libgnutls-version 30605))
-                    ":+VERS-TLS1.3")
-                ":+VERS-TLS1.2"))
-      ;; `gnutls-min-prime-bits' is set based on recommendations from
-      ;; https://www.keylength.com/en/4/
-      gnutls-min-prime-bits 3072
-      tls-checktrust gnutls-verify-error
-      ;; Emacs is built with `gnutls' by default, so `tls-program' would not be
-      ;; used in that case. Otherwise, people have reasons to not go with
-      ;; `gnutls', we use `openssl' instead. For more details, see
-      ;; https://redd.it/8sykl1
-      tls-program '("openssl s_client -connect %h:%p -CAfile %t -nbio -no_ssl3 -no_tls1 -no_tls1_1 -ign_eof"
-                    "gnutls-cli -p %p --dh-bits=3072 --ocsp --x509cafile=%t \
---strict-tofu --priority='SECURE192:+SECURE128:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3' %h"
-                    ;; compatibility fallbacks
-                    "gnutls-cli -p %p %h"))
 
-;; Emacs stores `authinfo' in $HOME and in plain-text. Let's not do that, mkay?
+;; Reduce debug output, well, unless we've asked for it.
-;; This file stores usernames, passwords, and other such treasures for the
+(setq debug-on-error init-file-debug
-;; aspiring malicious third party.
+      jka-compr-verbose init-file-debug)
-(setq auth-sources (list (concat doom-etc-dir "authinfo.gpg")
-                         "~/.authinfo.gpg"))
 
+;; Get rid of "For information about GNU Emacs..." message at startup, unless
+;; we're in a daemon session where it'll say "Starting Emacs daemon." instead,
+;; which isn't so bad.
+(unless (daemonp)
+  (advice-add #'display-startup-echo-area-message :override #'ignore))
 
-;;
+;; Reduce *Message* noise at startup. An empty scratch buffer (or the dashboard)
-;;; MODE-local-vars-hook
+;; is more than enough.
-
+(setq inhibit-startup-screen t
-;; File+dir local variables are initialized after the major mode and its hooks
+      inhibit-startup-echo-area-message user-login-name
-;; have run. If you want hook functions to be aware of these customizations, add
+      inhibit-default-init t
-;; them to MODE-local-vars-hook instead.
+      ;; Shave seconds off startup time by starting the scratch buffer in
-(defvar doom-inhibit-local-var-hooks nil)
+      ;; `fundamental-mode', rather than, say, `org-mode' or `text-mode', which
-
+      ;; pull in a ton of packages. `doom/open-scratch-buffer' provides a better
-(defun doom-run-local-var-hooks-h ()
+      ;; scratch buffer anyway.
-  "Run MODE-local-vars-hook after local variables are initialized."
+      initial-major-mode 'fundamental-mode
-  (unless doom-inhibit-local-var-hooks
+      initial-scratch-message nil)
-    (setq-local doom-inhibit-local-var-hooks t)
-    (doom-run-hooks (intern-soft (format "%s-local-vars-hook" major-mode)))))
-
-;; If the user has disabled `enable-local-variables', then
-;; `hack-local-variables-hook' is never triggered, so we trigger it at the end
-;; of `after-change-major-mode-hook':
-(defun doom-run-local-var-hooks-maybe-h ()
-  "Run `doom-run-local-var-hooks-h' if `enable-local-variables' is disabled."
-  (unless enable-local-variables
-    (doom-run-local-var-hooks-h)))
 
 
 ;;

early-init.el

@@ -11,20 +11,17 @@
 ;; Prevent unwanted runtime compilation for gccemacs (native-comp) users;
 ;; packages are compiled ahead-of-time when they are installed and site files
 ;; are compiled when gccemacs is installed.
-;; REVIEW Remove after a month
+(setq native-comp-deferred-compilation nil)
-(setq comp-deferred-compilation nil
-      native-comp-deferred-compilation nil)
-
-;; In noninteractive sessions, prioritize non-byte-compiled source files to
-;; prevent the use of stale byte-code. Otherwise, it saves us a little IO time
-;; to skip the mtime checks on every *.elc file.
-(setq load-prefer-newer noninteractive)
 
 ;; In Emacs 27+, package initialization occurs before `user-init-file' is
 ;; loaded, but after `early-init-file'. Doom handles package initialization, so
 ;; we must prevent Emacs from doing it early!
 (setq package-enable-at-startup nil)
-(fset #'package--ensure-init-file #'ignore)  ; DEPRECATED Removed in 28
+
+;; In noninteractive sessions, prioritize non-byte-compiled source files to
+;; prevent the use of stale byte-code. Otherwise, it saves us a little IO time
+;; to skip the mtime checks on every *.elc file.
+(setq load-prefer-newer noninteractive)
 
 (unless (or (daemonp) noninteractive)
   (let ((old-file-name-handler-alist file-name-handler-alist))
@@ -42,7 +39,19 @@
             ;; `file-name-handler-alist' since startup we want to preserve.
             (delete-dups (append file-name-handler-alist
                                  old-file-name-handler-alist))))
-    (add-hook 'emacs-startup-hook #'doom-reset-file-handler-alist-h 101)))
+    (add-hook 'emacs-startup-hook #'doom-reset-file-handler-alist-h 101))
+
+  ;; Contrary to what many Emacs users have in their configs, you don't need
+  ;; more than this to make UTF-8 the default coding system:
+  (set-language-environment "UTF-8"))
+
+
+;;
+;;; Bootstrap
+
+;; Contrary to what many Emacs users have in their configs, you don't need
+;; more than this to make UTF-8 the default coding system:
+(set-language-environment "UTF-8")
 
 ;; Ensure Doom is running out of this file's directory
 (setq user-emacs-directory (file-name-directory load-file-name))