From c7b34aab545af4f20daf26638536049865e75410 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 28 Oct 2021 01:45:12 +0100
Subject: and how about initial handling of colors?

---
 init.org                      | 19 ++++++++++++-------
 lib/themes/jao-light-theme.el |  1 +
 lib/themes/jao-themes.el      |  6 ++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/init.org b/init.org
index 1295068..2660395 100644
--- a/init.org
+++ b/init.org
@@ -592,7 +592,8 @@
         (if (jao-colors-scheme-dark-p)
             (setq jao-minibuffer-active-buffer-line-color "azure4"
                   jao-minibuffer-inactive-buffer-line-color "grey25")
-          (setq jao-minibuffer-active-buffer-line-color "burlywood3"))
+          (setq jao-minibuffer-active-buffer-line-color "burlywood3"
+                jao-minibuffer-inactive-buffer-line-color "grey25"))
         :commands (jao-minibuffer-add-variable
 		   jao-minibuffer-refresh
 		   jao-minibuffer-add-mode-line))
@@ -601,7 +602,9 @@
       (require 'mb-depth)
       (minibuffer-depth-indicate-mode 1)
 
-      (when window-system (jao-minibuffer-add-mode-line 90))
+      (when window-system
+        (add-hook 'after-init-hook
+                  (lambda ()) (jao-minibuffer-add-mode-line 90)))
     #+end_src
 *** Time display
     #+BEGIN_SRC emacs-lisp
@@ -1621,13 +1624,15 @@
       (use-package pdf-tools
         :ensure t
         :demand t
+        :init
+        (add-hook 'after-init-hook
+                  (lambda ()
+                    (setq pdf-view-midnight-colors
+                          (cons (frame-parameter nil 'foreground-color)
+                                (frame-parameter nil 'background-color)))))
         :config
         (pdf-tools-install)
 
-        (setq pdf-view-midnight-colors
-              (cons (frame-parameter nil 'foreground-color)
-                    (frame-parameter nil 'background-color)))
-
         (dolist (f '(pdf-view-scroll-up-or-next-page
                      pdf-view-scroll-down-or-previous-page
                      pdf-view-previous-line-or-previous-page
@@ -1996,7 +2001,7 @@
                       (put cmd 'repeat-map 'diff-hl-command-map))
                     diff-hl-command-map)
         (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
-        (diff-hl-margin-mode 1))
+        (when (jao-colors-scheme-dark-p) (diff-hl-margin-mode 1)))
 
       (global-diff-hl-mode 1)
 
diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el
index 828eb20..1dc1303 100644
--- a/lib/themes/jao-light-theme.el
+++ b/lib/themes/jao-light-theme.el
@@ -125,6 +125,7 @@
             (lui-track-bar (p dimm) :height 0.2 nul nil ex)
             (magit-diff-context-highlight (c nil yellow) ex)
             (magit-diff-hunk-heading-highlight (c nil yellow) it bf)
+            (message-header-subject (p f00) bf)
             (mode-line (c "grey30" dimm-background-3)
                        :box (:line-width -1 :color "grey90"))
             (mode-line-inactive (c "grey40" dimm-background-4)
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index d3f6baa..90be19f 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -1165,10 +1165,12 @@
          (f-alist (assq-delete-all 'foreground-color f-alist)))
     (when jao-themes--fg
       (push (cons 'foreground-color jao-themes--fg) f-alist)
-      (set-frame-parameter nil 'foreground-color jao-themes--fg))
+      (when (stringp jao-themes--fg)
+	(set-frame-parameter nil 'foreground-color jao-themes--fg)))
     (when jao-themes--bg
       (push (cons 'background-color jao-themes--bg) f-alist)
-      (set-frame-parameter nil 'background-color jao-themes--fg))
+      (when (stringp jao-themes--bg)
+	(set-frame-parameter nil 'background-color jao-themes--bg)))
     (setq window-system-default-frame-alist
           (cons
            (cons kind f-alist)
-- 
cgit v1.2.3