a slew of little fixes courtesy of the byte compiler

3 files changed, 392 insertions, 0 deletions

diff --git a/themes/jao-dark-theme.el b/themes/jao-dark-theme.el
new file mode 100644
index 0000000..9e07f1a
--- /dev/null
+++ b/themes/jao-dark-theme.el
@@ -0,0 +1,136 @@
+;;; jao-dark-theme.el --- a dark theme with blue-green accent -*- lexical-binding: t; -*-
+
+;; Author: jao <mail@jao.io>
+;; Keywords: themes
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+(defvar jao-theme-dark-bold
+  (if (> emacs-major-version 28) 'medium 'semibold))
+
+(jao-define-custom-theme jao-dark
+  (:names (bg "#282b33" nil nil)
+          (bg-alt "#1f2024" nil nil)
+          (fg "#c6c6c6")
+          (fg-0.5 "#a6a6a6")
+          (fg-1 "#868686")
+          (fg-2 "#666666")
+          (blue "#819cd6")
+          (blueish "#6e7899")
+          (dark-blue "#616c96")
+          (green "#5b94ab")
+          (yellow "antiquewhite3")
+          (dark-yellow "antiquewhite4")
+          (orange "#a6c1e0")
+          (orange2 "#dd8844")
+          (red "#e1c1ee" "#ff6655" "red")
+          (comments "azure4" "lightblue4")
+          (constants "honeydew4")
+          (dimm-line-fg "#3f3f3f")
+          (dimm-line "#7f7f7f")
+          (error "#e1c1ee")
+          (functions "#7ebebd")
+          (functions2 "#44b9b1")
+          (keywords "cadetblue3")
+          (keywords2 "#51afef")
+          (modeline-bg "#22242b")
+          (modeline-bg-inactive "#24262d")
+          ;;(region "#41454b")
+          (region "#31353b")
+          (strings "honeydew3")
+          (success "#5b94ab")
+          (warning "#cfcf9c")
+          (warning2 "#ECBE7B"))
+  (:face-family "Fira Code")
+  (:face-size 9)
+  (:bold-weight jao-theme-dark-bold)
+  (:palette (fg "#c6c6c6")
+            (bg "#1f2024")
+            (box "grey25")
+            (button (p f12) bx nul)
+            (hilite (c nil region) ex)
+            (link (ul dark-blue)) ;; (ul dimm-line)
+            (visited-link (ul dark-blue))
+            (tab-sel (c 252 232) nbf)
+            (tab-unsel (c 245 232))
+            (comment (c comments))
+            (keyword (c keywords))
+            (function (c functions))
+            (type (c constants))
+            (variable-name (c nil))
+            (constant (c constants))
+            (string (c strings) it)
+            (error (c warning2))
+            (warning (c warning))
+            (success (c green))
+            (dimm (c dimm-line))
+            (gnus-mail (c nil))
+            (gnus-news (c nil))
+            (outline-1 (c strings) nbf)
+            (outline-2 (c functions) nbf)
+            (outline-3 (c blue) nbf)
+            (outline-4 (c functions2) nbf)
+            (outline-5 (c nil))
+            (f00 (c "lightskyblue3"))
+            (f01 (c "lightskyblue4"))
+            (f02 (c "lightblue3"))
+            (f10 (c "lightblue4"))
+            (f11 (c "lightblue2"))
+            (f12 (c "azure3")))
+  (:x-faces (clojure-keyword-face (c "powder blue"))
+            (corfu-background (c "white" "grey20"))
+            (corfu-bar (c nil "grey20")) ;; moving part of the bar
+            (corfu-border (~ corfu-background)) ;; background of the bar
+            (corfu-current (c "white" "grey50") nbf nit nul)
+            (corfu-echo (~ default))
+            (cursor (c warning2 warning2))
+            (diff-hl-change (c green))
+            (diff-hl-delete (c orange2) bf)
+            (diff-hl-insert (c dark-blue))
+            (fill-column-indicator (c "black") :inherit nil)
+            (font-lock-doc-face (~ font-lock-comment-face) it)
+            (fringe (p dimm))
+            (gnus-button (c "lightyellow3"))
+            (gnus-cite-1 (c fg-0.5))
+            (gnus-cite-2 (c fg-1))
+            (gnus-cite-3 (c fg-2))
+            (gnus-cite-4 (c fg-2))
+            ;; (gnus-group-mail-3 (c yellow))
+            ;; (gnus-group-mail-3-empty (c fg-0.5))
+            ;; (gnus-group-news-3 (~ gnus-group-mail-3))
+            ;; (gnus-group-news-3-empty (~ gnus-group-mail-3-empty))
+            ;; (gnus-group-mail-low (p f10))
+            ;; (gnus-group-mail-low-empty (~ gnus-group-mail-3-empty))
+            (gnus-summary-cancelled  (c "dark slate gray" nil) st)
+            (gnus-summary-selected (p warning) nul nbf)
+            (header-line (p hilite))
+            (magit-diff-context-highlight (p hilite) ex)
+            (mode-line (c "grey60" modeline-bg)
+                       :box (:line-width 1 :color "#282b33"))
+            (mode-line-inactive (c "grey35" modeline-bg-inactive)
+                                :box (:line-width 1 :color "#282b33"))
+            (mode-line-buffer-id (c yellow))
+            (org-hide (c 0 nil))
+            (org-code (c yellow))
+            (scroll-bar (c bg))
+            (show-paren-match (c "darkseagreen1" "#5f5f5f"))
+            (shr-link (c blue) (ul dark-blue))
+            (vertical-border (c "black") :inherit nil)
+            (vertico-group-separator (p dimm) :strike-through "#6f6f6f")))
+
+;; (enable-theme 'jao-dark)
+;; (jao-mode-line-adjust-faces)
+
+
+(provide 'jao-dark-theme)
diff --git a/themes/jao-light-term-theme.el b/themes/jao-light-term-theme.el
new file mode 100644
index 0000000..ccd6a3f
--- /dev/null
+++ b/themes/jao-light-term-theme.el
@@ -0,0 +1,121 @@
+;;; jao-light-term-theme.el --- a light theme  -*- lexical-binding: t; -*-
+
+;; Author: jao <mail@jao.io>
+;; Keywords: themes
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+(jao-define-custom-theme jao-light-term
+  (:names (bg-lightest "gray98")
+          (bg-light "gray95")
+
+          (light-gray "gray80")
+
+          (black "black")
+          (dark-gray "gray30")
+          (fg-light "gray40")
+
+          ;; (hl "#f2f2f2")
+          (hl "ivory2")
+          (dimm "lemonchiffon4")
+
+          (warning "orange4")
+          (red "burlywood4")
+          (blue "#023770")
+          (green "#005555")
+          (lightgreen "darkgreen")
+          (yellow "lightyellow"))
+  (:face-size 9)
+  (:face-family "DejaVu Sans Mono")
+  (:bold-weight 'bold)
+  (:palette (fg "#000000")
+            (bg "#ffffff")
+            (box "gray80")
+            (hilite (c nil hl))
+            (link (c green) nbf nul)
+            (visited-link (c green))
+            (tab-sel (~ mode-line))
+            (tab-unsel (~ mode-line-inactive))
+            (comment (c fg-light) it)
+            (keyword (c blue) bf)
+            (type (c blue) nbf)
+            (function (c green))
+            (variable-name (c black))
+            (constant (c dark-gray))
+            (string (c blue) nit)
+            (warning (c warning))
+            (error (c red) bf)
+            (dimm (c dimm))
+            (gnus-mail (c "black"))
+            (gnus-news (c "black"))
+            (outline (c "black") bf)
+            (outline-1 (c green) nbf nul ex)
+            (outline-2 (c blue) nbf)
+            (outline-3 (c lightgreen) nbf)
+            (outline-4 (c blue) nul nbf)
+            (outline-5 (c blue) nul nbf)
+            (f00 (c green))
+            (f01 (c blue))
+            (f02 (c dark-gray))
+            (f10 (p f00))
+            (f11 (p f01))
+            (f12 (p f02)))
+  (:x-faces (button (c blue bg-lightest))
+            (compilation-info (c "#223142" nil) nbf)
+            (completions-group-separator (c nil ni) (st "grey80"))
+            (corfu-default (~ default) (c "black" "grey95"))
+            (corfu-bar (c nil "grey80")) ;; moving part of the bar
+            (corfu-border (~ corfu-background)) ;; background of the bar
+            (corfu-current (c "black" "grey95") nbf nit (ul "grey70"))
+            (cursor (c "sienna3" "sienna3"))
+            (diff-hl-margin-change (c "lightcyan2" nil))
+            (diff-hl-margin-insert (c "honeydew2" nil))
+            (diff-hl-margin-delete (c "wheat1" nil))
+            (eww-form-text (p hilite))
+            (fill-column-indicator (c "grey80"))
+            (fringe (c "grey70" nil))
+            (gnus-button (c blue))
+            (gnus-cite-1 (c "darkslategray" nil))
+            (gnus-cite-2 (c "slate gray" nil))
+            (gnus-cite-3 (c "slate gray" nil))
+            (gnus-cite-4 (c "slate gray" nil))
+            (gnus-header-name (c fg-light))
+            (gnus-summary-selected (c green) nbf)
+            (gnus-summary-cancelled (c "sienna3" nil) st)
+            (header-line (c dark-gray bg-lightest)
+                         :box (:line-width 1 :color "grey90"))
+            (magit-diff-context-highlight (c nil hl) ex)
+            (magit-diff-hunk-heading-highlight (c nil hl) it bf)
+            (mode-line (c "grey20" "gray90") nbf)
+            (mode-line-inactive (c "grey40" "gray95"))
+            (mode-line-buffer-id (~ default) (c dark-blue-2 nil) nit)
+            (mode-line-emphasis (c green nil))
+            (mode-line-highlight (c green nil))
+            (org-link (p link) (ul "grey80"))
+            (scroll-bar (c "grey90" nil))
+            (show-paren-match (c nil "grey85"))
+            (shr-text (c nil nil))
+            (shr-link (~ link) (ul light-gray))
+            (shr-code (c blue nil))
+            (success (c green))
+            (vertical-border (c "grey70" nil))
+            (vertico-current (c nil yellow) nul ext)
+            (widget-button (c blue nil) nit nul)
+            (widget-field (c nil bg-light) nit nul)
+            (whitespace-tag (p hilite))))
+
+;; (enable-theme 'jao-light-term)
+;; (jao-mode-line-adjust-faces)
+
+(provide 'jao-light-term-theme)
diff --git a/themes/jao-light-theme.el b/themes/jao-light-theme.el
new file mode 100644
index 0000000..7f75c68
--- /dev/null
+++ b/themes/jao-light-theme.el
@@ -0,0 +1,135 @@
+;;; jao-light-theme.el --- a light theme  -*- lexical-binding: t; -*-
+
+;; Author: jao <mail@jao.io>
+;; Keywords: themes
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+(jao-define-custom-theme jao-light
+  (:names (bg-lightest "gray98")
+          (bg-light "#efefef")
+
+          (light-gray "gray80")
+
+          (black "black")
+          (dark-gray "gray30")
+          (fg-light "gray40")
+
+          (hl "#f2f2f2")
+          (dimm "lemonchiffon4")
+
+          (warning "orange4")
+          (red "burlywood4")
+          (blue "#023770")
+          (pale-blue "honeydew3")
+          (green "#005555")
+          (lightgreen "darkgreen")
+          (yellow "lightyellow"))
+  (:bold-weight 'semibold)
+  (:palette (fg "black")
+            (bg "white")
+            (box "gray80")
+            (hilite (c nil hl))
+            (button (c fg-light bg-lightest) (ul light-gray))
+            (link (c green) nbf (ul light-gray))
+            (visited-link (ul light-gray) nbf)
+            (tab-sel (~ mode-line))
+            (tab-unsel (~ mode-line-inactive))
+            (comment (c fg-light) it)
+            (keyword (c blue) bf)
+            (type (c blue) nbf)
+            (function (c green))
+            (variable-name (c black))
+            (constant (c dark-gray))
+            (string (c blue) nit)
+            (warning (c warning))
+            (error (c red) bf)
+            (dimm (c dimm))
+            (gnus-mail (c "black"))
+            (gnus-news (c "black"))
+            (outline (c "black") bf)
+            (outline-1 (c green) bf)
+            (outline-2 (c green) nbf)
+            (outline-3 (c blue) nul nbf)
+            (outline-4 (c blue) nul nbf)
+            (outline-5 (c blue) nul nbf)
+            (f00 (c green))
+            (f01 (c blue))
+            (f02 (c dark-gray))
+            (f10 (p f00))
+            (f11 (p f01))
+            (f12 (p f02)))
+  (:x-faces (compilation-info (c "#223142" nil) nbf)
+            (completions-group-separator (c nil ni) (st "grey80"))
+            (corfu-default (~ default) (c "black" "grey95"))
+            (corfu-bar (c nil "grey80")) ;; moving part of the bar
+            (corfu-border (~ corfu-background)) ;; background of the bar
+            (corfu-current (c "black" "grey95") nbf nit (ul "grey70"))
+            (cursor (c "sienna3" "sienna3"))
+            (diff-hl-change (c "white" "honeydew2"))
+            (diff-hl-insert (c "white" "lemonchiffon2"))
+            (diff-hl-delete (c "white" "wheat1"))
+            (diff-hl-margin-change (c pale-blue))
+            (diff-hl-margin-insert (c pale-blue))
+            (diff-hl-margin-delete (c "wheat1"))
+            (fill-column-indicator (c "grey80"))
+            (fringe (c "grey70" nil))
+            (gnus-button (c blue))
+            (gnus-cite-1 (c "darkslategray" nil))
+            (gnus-cite-2 (c "slate gray" nil))
+            (gnus-cite-3 (c "slate gray" nil))
+            (gnus-cite-4 (c "slate gray" nil))
+            (gnus-face-4 (p f11) :family "Triplicate C4c")
+            (gnus-header-name (c fg-light))
+            (gnus-summary-selected (c green) nbf)
+            (gnus-summary-cancelled (c "sienna3" nil) st)
+            (header-line (c dark-gray bg-lightest)
+                         :box (:line-width 1 :color "grey90"))
+            (magit-diff-context-highlight (c nil yellow) ex)
+            (magit-diff-hunk-heading-highlight (c nil hl) it bf)
+            (message-header-subject (p warning) nbf)
+            (mode-line
+             (c "seashell3" nil)
+             :box (:line-width 1 :color "#dfdfdf" :style flat-button))
+            (mode-line-active
+             (c "#3f3f3f" "gray96")
+             :box (:line-width 1 :color "#dfdfdf" :style flat-button))
+            (mode-line-inactive
+             (c "#afafaf" nil)
+             :box (:line-width 1 :color "#efefdf" :style flat-button))
+            (mode-line-buffer-id (~ default) (c nil nil) nit)
+            (mode-line-emphasis (c green nil))
+            (mode-line-highlight (c green nil))
+            (org-agenda-calendar-event (p f02))
+            (org-agenda-structure (c nil "#efefef") ex)
+            (org-agenda-date (~ default))
+            (org-agenda-date-today (~ org-agenda-structure) ex)
+            (org-link (p link) (ul "grey80"))
+            (org-time-grid (c "grey60" nil))
+            (tab-bar (~ header-line) :family "Source Code Pro")
+            (scroll-bar (c "grey80" nil))
+            (show-paren-match (c nil "grey85"))
+            (shr-text (c nil nil))
+            (shr-link (~ link) (ul light-gray))
+            (shr-code (c blue nil))
+            (success (c green))
+            (vertical-border (c "#dfdfdf" nil))
+            (vterm-color-yellow (c "darkgoldenrod4" yellow))
+            (window-divider (c "grey99" nil))
+            (widget-button (~ default) nit (ul "grey80"))))
+
+;; (enable-theme 'jao-light)
+;; (jao-mode-line-adjust-faces)
+
+(provide 'jao-light-theme)