Further cleanup of core configuration

Remove the separates “Fixes” section and inline its content to other
configuration sections.  Fuse “Core Configuration” and “Basic Builtin Packages”
sections as those had always been similar anyway.

init.el

@@ -325,7 +325,7 @@
 (add-hook 'after-init-hook #'db/run-init)
 
 
-;; * Personal customization
+;; * Personal Customization Variables
 
 (use-package db-customize
   :demand t
@@ -348,8 +348,6 @@
 
 ;; * Core Configuration
 
-;; Configuration of C-level variables, startup.el, MULE, simple.el
-
 (use-package cl-lib
   :demand t)
 
@@ -447,27 +445,12 @@
 (put 'downcase-region 'disabled nil)
 (put 'narrow-to-region 'disabled nil)
 
-(setq-default savehist-file (expand-file-name "savehist" emacs-d))
+;; Fix: disable gconf settings, as it might interfere with ours, see
-
-(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
@@ -586,6 +569,7 @@
   :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))
 
@@ -593,6 +577,14 @@
   :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
@@ -600,10 +592,6 @@
               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
@@ -3105,6 +3093,15 @@ 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))