From d6037a24d4eb9663f239c47db1733b3df72a4f44 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 5 Jan 2025 00:56:21 -0500 Subject: [PATCH] refactor: load doom-compat.el from doom.el --- lisp/doom-lib.el | 3 --- lisp/doom.el | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/doom-lib.el b/lisp/doom-lib.el index 522327b44..288b599bd 100644 --- a/lisp/doom-lib.el +++ b/lisp/doom-lib.el @@ -2,9 +2,6 @@ ;;; Commentary: ;;; Code: -(when (< emacs-major-version 30) - (require 'doom-compat)) - ;;; Custom error types (define-error 'doom-error "An unexpected Doom error") (dolist (type '((doom-font-error "Could not find a font on your system" doom-error) diff --git a/lisp/doom.el b/lisp/doom.el index 0a8d9be1a..a4696aa20 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -197,6 +197,12 @@ (setenv "HOME" realhome) (setq abbreviated-home-dir nil))) + +;;; Backport niceties from later versions of Emacs: +(when (< emacs-major-version 30) + (require 'doom-compat)) + + ;;; Load Doom's stdlib (add-to-list 'load-path (file-name-directory load-file-name)) (require 'doom-lib)