init.el

@@ -325,7 +325,7 @@
 (add-hook 'after-init-hook #'db/run-init)
 
 
-;; * Personal Customization Variables
+;; * Personal customization
 
 (use-package db-customize
   :demand t
@@ -348,6 +348,8 @@
 
 ;; * Core Configuration
 
+;; Configuration of C-level variables, startup.el, MULE, simple.el
+
 (use-package cl-lib
   :demand t)
 
@@ -445,12 +447,27 @@
 (put 'downcase-region 'disabled nil)
 (put 'narrow-to-region 'disabled nil)
 
-;; Fix: disable gconf settings, as it might interfere with ours, see
+(setq-default savehist-file (expand-file-name "savehist" emacs-d))
+
+(setq default-input-method "TeX")
+
+
+;; * Fixes
+
+(with-eval-after-load 'enriched
+  (defun enriched-decode-display-prop (start end &optional params)
+    (ignore params)
+    (list start end)))
+
+;; Disable gconf settings, as it might interfere with ours.  Cf.
 ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25228 and
 ;; https://emacs.stackexchange.com/questions/32641/something-changes-the-default-face-in-my-emacs.
 (define-key special-event-map [config-changed-event] 'ignore)
 
-;; Individual package configuration from here on.
+
+;; * Basic Builtin Packages
+
+;; All packages configured here should be part of Emacs core.
 
 (use-package abbrev
   :init (setq save-abbrevs 'silently
@@ -569,7 +586,6 @@
   :commands (zap-up-to-char zap-to-char))
 
 (use-package quail
-  :init (setq default-input-method "TeX")
   :config (add-hook 'input-method-activate-hook
                     #'db/add-symbols-to-TeX-input-method))
 
@@ -577,14 +593,6 @@
   :commands (re-builder)
   :init (setq reb-re-syntax 'string))
 
-(use-package savehist
-  :commands (savehist-mode)
-  :init (setq savehist-file (expand-file-name "savehist" emacs-d)))
-
-(use-package server
-  :commands (server-running-p server-start)
-  :init (setq server-log t))
-
 (use-package shr
   :init (setq shr-use-fonts nil
               shr-use-colors nil
@@ -592,6 +600,10 @@
               shr-image-animate nil
               shr-width (current-fill-column)))
 
+(use-package server
+  :commands (server-running-p server-start)
+  :init (setq server-log t))
+
 (use-package tab-bar
   :init (setq tab-bar-show t
               tab-bar-format '(tab-bar-format-tabs
@@ -616,13 +628,7 @@
               recenter-positions '(top middle bottom))
   :config (progn
             (add-to-list 'display-buffer-alist
-                         '("^\\*Async Shell Command*" display-buffer-no-window))
+                         '("^\\*Async Shell Command*" . (display-buffer-no-window)))))
-            (add-to-list 'display-buffer-alist
-                         '("^\\*Warnings\\*"
-                           (display-buffer-in-side-window)
-                           (side . right)
-                           (slot . 0)
-                           (window-width . 0.33)))))
 
 (use-package winner
   :commands (winner-mode winner-undo winner-redo))
@@ -3093,15 +3099,6 @@ With given ARG, display files in `db/important-document-path’."
   :ensure t
   :commands edit-list)
 
-(use-package enriched
-  :defer t
-  :config (progn
-            ;; https://www.opencve.io/cve/CVE-2017-14482 for Emacs before 25.3
-            (when (version< emacs-version "25.3")
-              (defun enriched-decode-display-prop (start end &optional params)
-                (ignore params)
-                (list start end)))))
-
 (use-package expand-region
   :ensure t
   :commands (er/expand-region))