Merge branch 'master' into layer/cosmetics

early-init.el

@@ -1,11 +1,11 @@
-;;; early-init.el --- earliest birds               -*- lexical-binding: t -*-
+;;; early-init.el --- Earliest birds               -*- lexical-binding: t -*-
 
 (setq load-prefer-newer t)
 
-(add-to-list 'load-path
+(add-to-list 'load-path (expand-file-name "lib/borg" user-emacs-directory))
-             (expand-file-name
+(require 'borg)
-              "lib/auto-compile"
+(borg-initialize)
-              (file-name-directory (or load-file-name buffer-file-name))))
+
 (require 'auto-compile)
 (auto-compile-on-load-mode)
 (auto-compile-on-save-mode)
@@ -13,9 +13,7 @@
 (setq package-enable-at-startup nil)
 
 (with-eval-after-load 'package
-  (add-to-list 'package-archives
+  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
-               (cons "melpa" "https://melpa.org/packages/")
-               t))
 
 ;; Local Variables:
 ;; no-byte-compile: t

init.el

@@ -1,18 +1,7 @@
 ;;; init.el --- user-init-file                    -*- lexical-binding: t -*-
+(borg-report-load-duration)
 ;;; Early birds
 (progn ;     startup
-  (defvar before-user-init-time (current-time)
-    "Value of `current-time' when Emacs begins loading `user-init-file'.")
-  (message "Loading Emacs...done (%.3fs)"
-           (float-time (time-subtract before-user-init-time
-                                      before-init-time)))
-  (setq user-init-file (or load-file-name buffer-file-name))
-  (setq user-emacs-directory (file-name-directory user-init-file))
-  (message "Loading %s..." user-init-file)
-  (when (< emacs-major-version 27)
-    (setq package-enable-at-startup nil)
-    ;; (package-initialize)
-    (load-file (expand-file-name "early-init.el" user-emacs-directory)))
   (setq inhibit-startup-buffer-menu t)
   (setq inhibit-startup-screen t)
   (setq inhibit-startup-echo-area-message "locutus")
@@ -24,11 +13,6 @@
     (tool-bar-mode 0))
   (menu-bar-mode 0))
 
-(eval-and-compile ; `borg'
-  (add-to-list 'load-path (expand-file-name "lib/borg" user-emacs-directory))
-  (require 'borg)
-  (borg-initialize))
-
 (eval-and-compile ; `use-package'
   (setopt use-package-enable-imenu-support t)
   (setopt use-package-verbose t)
@@ -46,23 +30,19 @@
   (setq auto-compile-display-buffer               nil)
   (setq auto-compile-mode-line-counter            t)
   (setq auto-compile-source-recreate-deletes-dest t)
-  (setq auto-compile-toggle-deletes-nonlib-dest   t)
+  (setq auto-compile-toggle-deletes-nonlib-dest   t))
-  (setq auto-compile-update-autoloads             t))
 
 (use-package epkg
   :defer t
   :init
-  (setq epkg-repository
+  (setq epkg-repository (expand-file-name "var/epkgs/" user-emacs-directory)))
-        (expand-file-name "var/epkgs/" user-emacs-directory))
-  (setq epkg-database-connector
-        (if (>= emacs-major-version 29) 'sqlite-builtin 'sqlite-module)))
 
 (use-package custom
   :no-require t
   :config
   (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
   (when (file-exists-p custom-file)
-    (load custom-file)))
+    (load custom-file nil t)))
 
 (use-package server
   :functions (server-running-p)
@@ -70,8 +50,7 @@
 
 (progn ;     startup
   (message "Loading early birds...done (%.3fs)"
-           (float-time (time-subtract (current-time)
+           (float-time (time-subtract (current-time) before-init-time))))
-                                      before-user-init-time))))
 
 ;;; Long tail
 
@@ -92,10 +71,9 @@
 (use-package diff-mode
   :defer t
   :config
-  (when (>= emacs-major-version 27)
+  (set-face-attribute 'diff-refine-changed nil :extend t)
-    (set-face-attribute 'diff-refine-changed nil :extend t)
+  (set-face-attribute 'diff-refine-removed nil :extend t)
-    (set-face-attribute 'diff-refine-removed nil :extend t)
+  (set-face-attribute 'diff-refine-added   nil :extend t))
-    (set-face-attribute 'diff-refine-added   nil :extend t)))
 
 (use-package dim-autoload
   :config (global-dim-autoload-cookies-mode))
@@ -105,7 +83,6 @@
   :config (setq dired-listing-switches "-alh"))
 
 (use-package eldoc
-  :when (version< "25" emacs-version)
   :config (global-eldoc-mode))
 
 (use-package help
@@ -170,7 +147,6 @@
   :config (savehist-mode))
 
 (use-package saveplace
-  :when (version< "25" emacs-version)
   :config (save-place-mode))
 
 (use-package simple
@@ -179,9 +155,8 @@
 (use-package smerge-mode
   :defer t
   :config
-  (when (>= emacs-major-version 27)
+  (set-face-attribute 'smerge-refined-removed nil :extend t)
-    (set-face-attribute 'smerge-refined-removed nil :extend t)
+  (set-face-attribute 'smerge-refined-added   nil :extend t))
-    (set-face-attribute 'smerge-refined-added   nil :extend t)))
 
 (progn ;    `text-mode'
   (add-hook 'text-mode-hook 'indicate-buffer-boundaries-left))
@@ -204,24 +179,10 @@
 
 ;;; Tequila worms
 
-(progn ;     startup
+(borg--load-config (concat (user-real-login-name) ".el"))
-  (message "Loading %s...done (%.3fs)" user-init-file
+(borg-report-after-init-duration)
-           (float-time (time-subtract (current-time)
-                                      before-user-init-time)))
-  (add-hook 'after-init-hook
-            (lambda ()
-              (message
-               "Loading %s...done (%.3fs) [after-init]" user-init-file
-               (float-time (time-subtract (current-time)
-                                          before-user-init-time))))
-            t))
-
-(progn ;     personalize
-  (let ((file (expand-file-name (concat (user-real-login-name) ".el")
-                                user-emacs-directory)))
-    (when (file-exists-p file)
-      (load file))))
 
+;;; _
 ;; Local Variables:
 ;; indent-tabs-mode: nil
 ;; End: