Move the defvar to the top of the files

early-init.el

@@ -14,14 +14,8 @@
 
 ;;; Code:
 
-;;; Variables
-(defvar minimal-emacs-debug nil
-  "Non-nil to enable debug.")
-
-(defvar minimal-emacs-gc-cons-threshold (* 16 1024 1024)
-  "The value of `gc-cons-threshold' after Emacs startup.")
-
 ;;; Load pre-early-init.el
+
 (defvar minimal-emacs--default-user-emacs-directory user-emacs-directory
   "The default value of the `user-emacs-directory' variable.")
 
@@ -40,6 +34,22 @@
 
 (minimal-emacs-load-user-init "pre-early-init.el")
 
+;;; Variables
+(defvar minimal-emacs-debug nil
+  "Non-nil to enable debug.")
+
+(defvar minimal-emacs-gc-cons-threshold (* 16 1024 1024)
+  "The value of `gc-cons-threshold' after Emacs startup.")
+
+(defvar minimal-emacs-frame-title-format "%b – Emacs"
+  "Template for displaying the title bar of visible and iconified frame.")
+
+(defvar minimal-emacs-default-gc-cons-threshold gc-cons-threshold
+  "The default value of `gc-cons-threshold'.")
+
+(defvar minimal-emacs--default-mode-line-format mode-line-format
+  "Default value of `mode-line-format'.")
+
 ;;; Misc
 
 (set-language-environment "UTF-8")
@@ -50,8 +60,6 @@
 ;;; Garbage collection
 ;; Garbage collection significantly affects startup times. This setting delays
 ;; garbage collection during startup but will be reset later.
-(defvar minimal-emacs-default-gc-cons-threshold gc-cons-threshold
-  "The default value of `gc-cons-threshold'.")
 
 (setq gc-cons-threshold most-positive-fixnum)
 
@@ -122,8 +130,6 @@
                       inhibit-message nil)
         (redraw-frame))
 
-      (defvar minimal-emacs--default-mode-line-format mode-line-format
-        "Default value of `mode-line-format'.")
       (setq-default mode-line-format nil)
 
       (defun my--startup-load-user-init-file (fn &rest args)
@@ -249,8 +255,8 @@
 ;; Always ensure packages are installed
 (setq use-package-always-ensure t)
 
-(setq frame-title-format '("%b – Emacs")
+(setq frame-title-format minimal-emacs-frame-title-format
-      icon-title-format frame-title-format)
+      icon-title-format minimal-emacs-frame-title-format)
 
 ;;; Load post-early-init.el
 (minimal-emacs-load-user-init "post-early-init.el")

init.el

@@ -17,6 +17,16 @@
 ;;; Load pre-init.el
 (minimal-emacs-load-user-init "pre-init.el")
 
+;;; Variables
+(defvar minimal-emacs-window-divider-mode-enabled t
+  "Non-nil to enable `window-divider-mode'.")
+
+(defvar minimal-emacs-recentf-enabled t
+  "Non-nil to enable `recentf'.")
+
+(defvar minimal-emacs-savehist-enabled t
+  "Non-nil to enable `savehist'.")
+
 ;;; package.el
 
 (require 'package)
@@ -124,9 +134,6 @@
       window-divider-default-places t
       window-divider-default-right-width 1)
 
-(defvar minimal-emacs-window-divider-mode-enabled t
-  "Non-nil to enable `window-divider-mode'.")
-
 (when minimal-emacs-window-divider-mode-enabled
   (add-hook 'after-init-hook #'window-divider-mode))
 
@@ -182,18 +189,12 @@
 (setq recentf-max-saved-items 300) ; default is 20
 (setq recentf-auto-cleanup 'mode)
 
-(defvar minimal-emacs-recentf-enabled t
-  "Non-nil to enable `recentf'.")
-
 (when minimal-emacs-recentf-enabled
   (add-hook 'after-init-hook #'recentf-mode))
 
 ;;; savehist
 (setq savehist-save-minibuffer-history t)  ;; Default
 
-(defvar minimal-emacs-savehist-enabled t
-  "Non-nil to enable `savehist'.")
-
 (when minimal-emacs-savehist-enabled
   (add-hook 'after-init-hook #'savehist-mode))