Package: solarized-emacs Version: 1.2.2-4 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for solarized-emacs (versioned as 1.3.0-0.1~exp0) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. --
diff -Nru solarized-emacs-1.2.2/child-theme-example/themes/my-solarized-dark-theme.el solarized-emacs-1.3.0/child-theme-example/themes/my-solarized-dark-theme.el --- solarized-emacs-1.2.2/child-theme-example/themes/my-solarized-dark-theme.el 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/child-theme-example/themes/my-solarized-dark-theme.el 2019-06-06 11:20:58.000000000 -0400 @@ -3,7 +3,7 @@ ;; This files needs to be places iside the custom-theme-load-path list -(deftheme my-solarized-dark "The light variant of the Solarized colour theme") +(deftheme my-solarized-dark "The dark variant of the Solarized colour theme") (create-solarized-theme 'dark 'my-solarized-dark 'my-solarized-theme) (provide-theme 'my-solarized-dark) diff -Nru solarized-emacs-1.2.2/debian/changelog solarized-emacs-1.3.0/debian/changelog --- solarized-emacs-1.2.2/debian/changelog 2019-02-02 04:46:04.000000000 -0500 +++ solarized-emacs-1.3.0/debian/changelog 2019-06-06 11:21:07.000000000 -0400 @@ -1,3 +1,10 @@ +solarized-emacs (1.3.0-0.1~exp0) experimental; urgency=medium + + * Non-maintainer upload. + * New upstream release. + + -- Antoine Beaupré <anar...@debian.org> Thu, 06 Jun 2019 11:21:07 -0400 + solarized-emacs (1.2.2-4) unstable; urgency=medium * Migrate to dh 12 diff -Nru solarized-emacs-1.2.2/debian/patches/0001-remove-badges.diff solarized-emacs-1.3.0/debian/patches/0001-remove-badges.diff --- solarized-emacs-1.2.2/debian/patches/0001-remove-badges.diff 2019-02-02 04:46:04.000000000 -0500 +++ solarized-emacs-1.3.0/debian/patches/0001-remove-badges.diff 2019-06-06 11:21:07.000000000 -0400 @@ -4,14 +4,16 @@ This patch removes badges icons from README files. These icons are intended rather for developers and are loaded from several external web sites. ---- a/README.md -+++ b/README.md +Index: b/README.md +=================================================================== +--- a/README.md 2019-06-06 11:22:15.534788629 -0400 ++++ b/README.md 2019-06-06 11:22:29.978725995 -0400 @@ -1,8 +1,3 @@ -[![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt) -[](http://melpa.org/#/solarized-theme) -[](http://stable.melpa.org/#/solarized-theme) -[](https://gitter.im/bbatsov/solarized-emacs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - - ## Solarized for Emacs + # Solarized for Emacs Solarized for Emacs is an Emacs port of the [Solarized theme for vim](http://ethanschoonover.com/solarized), diff -Nru solarized-emacs-1.2.2/debian/patches/0002-remove-dependency-on-dash-elpa-package.diff solarized-emacs-1.3.0/debian/patches/0002-remove-dependency-on-dash-elpa-package.diff --- solarized-emacs-1.2.2/debian/patches/0002-remove-dependency-on-dash-elpa-package.diff 2019-02-02 04:46:04.000000000 -0500 +++ solarized-emacs-1.3.0/debian/patches/0002-remove-dependency-on-dash-elpa-package.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,14 +0,0 @@ -From: Lev Lamberov <dogs...@debian.org> -Subject: Remove dependency on dash.el - -This patch removes dependency on dash.el, since that package is not yet known -to elpa. - ---- a/solarized-theme-pkg.el -+++ b/solarized-theme-pkg.el -@@ -2,4 +2,4 @@ - "solarized-theme" - "1.2.2" - "The Solarized color theme, ported to Emacs." -- '((dash "2.6.0"))) -+ '()) diff -Nru solarized-emacs-1.2.2/debian/patches/series solarized-emacs-1.3.0/debian/patches/series --- solarized-emacs-1.2.2/debian/patches/series 2019-02-02 04:46:04.000000000 -0500 +++ solarized-emacs-1.3.0/debian/patches/series 2019-06-06 11:21:07.000000000 -0400 @@ -1,2 +1 @@ 0001-remove-badges.diff -0002-remove-dependency-on-dash-elpa-package.diff diff -Nru solarized-emacs-1.2.2/.gitignore solarized-emacs-1.3.0/.gitignore --- solarized-emacs-1.2.2/.gitignore 1969-12-31 19:00:00.000000000 -0500 +++ solarized-emacs-1.3.0/.gitignore 2019-06-06 11:20:58.000000000 -0400 @@ -0,0 +1 @@ +*.elc diff -Nru solarized-emacs-1.2.2/README.md solarized-emacs-1.3.0/README.md --- solarized-emacs-1.2.2/README.md 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/README.md 2019-06-06 11:20:58.000000000 -0400 @@ -3,11 +3,13 @@ [](http://stable.melpa.org/#/solarized-theme) [](https://gitter.im/bbatsov/solarized-emacs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -## Solarized for Emacs +# Solarized for Emacs Solarized for Emacs is an Emacs port of the [Solarized theme for vim](http://ethanschoonover.com/solarized), developed by Ethan Schoonover. +You can find several screenshots of Solarized for Emacs [here](https://emacsthemes.com/themes/solarized-themes.html). + Solarized for Emacs is tested only under Emacs 24, but should be working under Emacs 23 as well. The theme is implemented in terms of customizations and `deftheme` and does not require the @@ -16,16 +18,27 @@ ## Installation Solarized for Emacs is available for installation via the -[MELPA](http://melpa.org) and -[Marmalade](http://marmalade-repo.org/) `package.el` -repositories. Assuming you've set one of the them up (I recommend -MELPA) you can install solarized like this: +[MELPA](http://melpa.org) `package.el` +repository. Assuming you've set it up you can install Solarized like this: `M-x package-install solarized-theme` -Afterwards - business as usual, just load one of the theme variants with `M-x +This package will install two variants of the theme - `solarized-light-theme` +and `solarized-dark-theme`. You can load one of the theme variants with `M-x load-theme`. +To load it automatically on Emacs startup add this to your init file: + +```el +(load-theme 'solarized-light t) +``` + +or + +```el +(load-theme 'solarized-dark t) +``` + (If you want to install manually that procedure is briefly documented in the FAQ at the end of this document.) @@ -60,11 +73,11 @@ (setq solarized-scale-org-headlines nil) ;; Avoid all font-size changes -(setq solarized-height-minus-1 1) -(setq solarized-height-plus-1 1) -(setq solarized-height-plus-2 1) -(setq solarized-height-plus-3 1) -(setq solarized-height-plus-4 1) +(setq solarized-height-minus-1 1.0) +(setq solarized-height-plus-1 1.0) +(setq solarized-height-plus-2 1.0) +(setq solarized-height-plus-3 1.0) +(setq solarized-height-plus-4 1.0) ``` diff -Nru solarized-emacs-1.2.2/solarized-dark-theme.el solarized-emacs-1.3.0/solarized-dark-theme.el --- solarized-emacs-1.2.2/solarized-dark-theme.el 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/solarized-dark-theme.el 2019-06-06 11:20:58.000000000 -0400 @@ -1,3 +1,26 @@ +;;; solarized-dark-theme.el --- Solarized Dark Theme for Emacs. + +;; Copyright (C) 2011-2019 Bozhidar Batsov + +;; 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 <http://www.gnu.org/licenses/>. + +;;; Commentary: +;; +;; The dark variant of the solarized theme. +;; +;;; Code: + (require 'solarized) (deftheme solarized-dark "The dark variant of the Solarized colour theme") @@ -5,3 +28,6 @@ (create-solarized-theme 'dark 'solarized-dark) (provide-theme 'solarized-dark) + +(provide 'solarized-dark-theme) +;;; solarized-dark-theme.el ends here diff -Nru solarized-emacs-1.2.2/solarized.el solarized-emacs-1.3.0/solarized.el --- solarized-emacs-1.2.2/solarized.el 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/solarized.el 2019-06-06 11:20:58.000000000 -0400 @@ -1,11 +1,13 @@ ;;; solarized.el --- Solarized for Emacs. -;; Copyright (C) 2011-2015 Bozhidar Batsov +;; Copyright (C) 2011-2019 Bozhidar Batsov ;; Author: Bozhidar Batsov <bozhi...@batsov.com> ;; Author: Thomas Frössman <thom...@jossystem.se> ;; URL: http://github.com/bbatsov/solarized-emacs -;; Version: 1.2.2 +;; Version: 1.3.0 +;; Package-Requires: ((emacs "24") (dash "2.16")) +;; Keywords: themes, solarized ;; 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 @@ -40,6 +42,7 @@ ;;; Code: (require 'dash) +(require 'color) ;;; Options @@ -55,7 +58,7 @@ :group 'solarized) (defcustom solarized-distinct-doc-face nil - "Make font-lock-doc-face stand out more. + "Make `font-lock-doc-face' stand out more. Related discussion: https://github.com/bbatsov/solarized-emacs/issues/158"; :type 'boolean :group 'solarized) @@ -111,34 +114,18 @@ :group 'solarized) (defcustom solarized-scale-org-headlines t - "Whether scaling of outline-headlines should apply to org-mode headlines." + "Whether `org-mode' headlines should be scaled." :type 'boolean :group 'solarized) -;;; Utilities +(defcustom solarized-scale-outline-headlines t + "Whether `outline-mode' headlines should be scaled." + :type 'boolean + :group 'solarized) -(defun solarized-color-name-to-rgb (color &optional frame) - "Convert COLOR string to a list of normalized RGB components. -COLOR should be a color name (e.g. \"white\") or an RGB triplet -string (e.g. \"#ff12ec\"). - -Normally the return value is a list of three floating-point -numbers, (RED GREEN BLUE), each between 0.0 and 1.0 inclusive. - -Optional argument FRAME specifies the frame where the color is to be -displayed. If FRAME is omitted or nil, use the selected frame. -If FRAME cannot display COLOR, return nil." - ;; `colors-values' maximum value is either 65535 or 65280 depending on the - ;; display system. So we use a white conversion to get the max value. - (let ((valmax (float (car (color-values "#ffffff"))))) - (mapcar (lambda (x) (/ x valmax)) (color-values color frame)))) - -(defun solarized-color-rgb-to-hex (red green blue) - "Return hexadecimal notation for the color RED GREEN BLUE. -RED, GREEN, and BLUE should be numbers between 0.0 and 1.0, inclusive." - (format "#%02x%02x%02x" - (* red 255) (* green 255) (* blue 255))) +;;; Utilities +;;;###autoload (defun solarized-color-blend (color1 color2 alpha) "Blends COLOR1 onto COLOR2 with ALPHA. @@ -146,13 +133,133 @@ triplet strings (e.g. \"#ff12ec\"). Alpha should be a float between 0 and 1." - (apply 'solarized-color-rgb-to-hex + (apply 'color-rgb-to-hex (-zip-with '(lambda (it other) (+ (* alpha it) (* other (- 1 alpha)))) - (solarized-color-name-to-rgb color1) - (solarized-color-name-to-rgb color2)))) + (color-name-to-rgb color1) + (color-name-to-rgb color2)))) ;;; Setup Start +(defmacro solarized-with-color-variables (variant &rest body) + (declare (indent defun)) + `(let* ((class '((class color) (min-colors 89))) + (light-class (append '((background light)) class)) + (dark-class (append '((background dark)) class)) + (variant ,variant) + (s-base03 "#002b36") + (s-base02 "#073642") + ;; emphasized content + (s-base01 "#586e75") + ;; primary content + (s-base00 "#657b83") + (s-base0 "#839496") + ;; comments + (s-base1 "#93a1a1") + ;; background highlight light + (s-base2 "#eee8d5") + ;; background light + (s-base3 "#fdf6e3") + + ;; Solarized accented colors + (yellow "#b58900") + (orange "#cb4b16") + (red "#dc322f") + (magenta "#d33682") + (violet "#6c71c4") + (blue "#268bd2") + (cyan "#2aa198") + (green "#859900") + + ;; Darker and lighter accented colors + ;; Only use these in exceptional circumstances! + (yellow-d "#7B6000") + (yellow-l "#DEB542") + (orange-d "#8B2C02") + (orange-l "#F2804F") + (red-d "#990A1B") + (red-l "#FF6E64") + (magenta-d "#93115C") + (magenta-l "#F771AC") + (violet-d "#3F4D91") + (violet-l "#9EA0E5") + (blue-d "#00629D") + (blue-l "#69B7F0") + (cyan-d "#00736F") + (cyan-l "#69CABF") + (green-d "#546E00") + (green-l "#B4C342") + + ;; Solarized palette names, use these instead of -fg -bg... + (base0 (if (eq variant 'light) s-base00 s-base0)) + (base00 (if (eq variant 'light) s-base0 s-base00)) + (base1 (if (eq variant 'light) s-base01 s-base1)) + (base01 (if (eq variant 'light) s-base1 s-base01)) + (base2 (if (eq variant 'light) s-base02 s-base2)) + (base02 (if (eq variant 'light) s-base2 s-base02)) + (base3 (if (eq variant 'light) s-base03 s-base3)) + (base03 (if (eq variant 'light) s-base3 s-base03)) + + ;; Line drawing color + ;; + ;; NOTE only use this for very thin lines that are hard to see using base02, in low + ;; color displayes base02 might be used instead + (s-line (if (eq variant 'light) "#cccec4" "#284b54")) + + ;; Light/Dark adaptive higher/lower contrast accented colors + ;; + ;; NOTE Only use these in exceptional cirmumstances! + (yellow-hc (if (eq variant 'light) yellow-d yellow-l)) + (yellow-lc (if (eq variant 'light) yellow-l yellow-d)) + (orange-hc (if (eq variant 'light) orange-d orange-l)) + (orange-lc (if (eq variant 'light) orange-l orange-d)) + (red-hc (if (eq variant 'light) red-d red-l)) + (red-lc (if (eq variant 'light) red-l red-d)) + (magenta-hc (if (eq variant 'light) magenta-d magenta-l)) + (magenta-lc (if (eq variant 'light) magenta-l magenta-d)) + (violet-hc (if (eq variant 'light) violet-d violet-l)) + (violet-lc (if (eq variant 'light) violet-l violet-d)) + (blue-hc (if (eq variant 'light) blue-d blue-l)) + (blue-lc (if (eq variant 'light) blue-l blue-d)) + (cyan-hc (if (eq variant 'light) cyan-d cyan-l)) + (cyan-lc (if (eq variant 'light) cyan-l cyan-d)) + (green-hc (if (eq variant 'light) green-d green-l)) + (green-lc (if (eq variant 'light) green-l green-d)) + + ;; customize based face properties + (s-maybe-bold (if solarized-use-less-bold + 'unspecified 'bold)) + (s-maybe-italic (if solarized-use-more-italic + 'italic 'normal)) + (s-variable-pitch (if solarized-use-variable-pitch + 'variable-pitch 'default)) + (s-fringe-bg (if solarized-distinct-fringe-background + base02 base03)) + (s-fringe-fg base01) + + (s-header-line-fg (if solarized-high-contrast-mode-line + base1 base0)) + (s-header-line-bg (if solarized-high-contrast-mode-line + base02 base03)) + (s-header-line-underline (if solarized-high-contrast-mode-line + nil base02)) + + (s-mode-line-fg (if solarized-high-contrast-mode-line + base03 base0)) + (s-mode-line-bg (if solarized-high-contrast-mode-line + base0 base02)) + (s-mode-line-underline (if solarized-high-contrast-mode-line + nil s-line)) + + (s-mode-line-buffer-id-fg (if solarized-high-contrast-mode-line + 'unspecified base1)) + (s-mode-line-inactive-fg (if solarized-high-contrast-mode-line + base0 base01)) + (s-mode-line-inactive-bg (if solarized-high-contrast-mode-line + base02 base03)) + (s-mode-line-inactive-bc (if solarized-high-contrast-mode-line + base02 base02)) + ) + ,@body)) (defun create-solarized-theme (variant theme-name &optional childtheme) "Create a VARIANT of the theme named THEME-NAME. @@ -160,142 +267,59 @@ When optional argument CHILDTHEME function is supplied it's invoked to further customize the resulting theme." ;;; Color palette - (let* ((class '((class color) (min-colors 89))) - (s-base03 "#002b36") - (s-base02 "#073642") - ;; emphasized content - (s-base01 "#586e75") - ;; primary content - (s-base00 "#657b83") - (s-base0 "#839496") - ;; comments - (s-base1 "#93a1a1") - ;; background highlight light - (s-base2 "#eee8d5") - ;; background light - (s-base3 "#fdf6e3") - - ;; Solarized accented colors - (yellow "#b58900") - (orange "#cb4b16") - (red "#dc322f") - (magenta "#d33682") - (violet "#6c71c4") - (blue "#268bd2") - (cyan "#2aa198") - (green "#859900") - - ;; Darker and lighter accented colors - ;; Only use these in exceptional circumstances! - (yellow-d "#7B6000") - (yellow-l "#DEB542") - (orange-d "#8B2C02") - (orange-l "#F2804F") - (red-d "#990A1B") - (red-l "#FF6E64") - (magenta-d "#93115C") - (magenta-l "#F771AC") - (violet-d "#3F4D91") - (violet-l "#9EA0E5") - (blue-d "#00629D") - (blue-l "#69B7F0") - (cyan-d "#00736F") - (cyan-l "#69CABF") - (green-d "#546E00") - (green-l "#B4C342") - - ;; Solarized palette names, use these instead of -fg -bg... - (base0 (if (eq variant 'light) s-base00 s-base0)) - (base00 (if (eq variant 'light) s-base0 s-base00)) - (base1 (if (eq variant 'light) s-base01 s-base1)) - (base01 (if (eq variant 'light) s-base1 s-base01)) - (base2 (if (eq variant 'light) s-base02 s-base2)) - (base02 (if (eq variant 'light) s-base2 s-base02)) - (base3 (if (eq variant 'light) s-base03 s-base3)) - (base03 (if (eq variant 'light) s-base3 s-base03)) - - ;; Line drawing color - ;; - ;; NOTE only use this for very thin lines that are hard to see using base02, in low - ;; color displayes base02 might be used instead - (s-line (if (eq variant 'light) "#cccec4" "#284b54")) - - ;; Light/Dark adaptive higher/lower contrast accented colors - ;; - ;; NOTE Only use these in exceptional cirmumstances! - (yellow-hc (if (eq variant 'light) yellow-d yellow-l)) - (yellow-lc (if (eq variant 'light) yellow-l yellow-d)) - (orange-hc (if (eq variant 'light) orange-d orange-l)) - (orange-lc (if (eq variant 'light) orange-l orange-d)) - (red-hc (if (eq variant 'light) red-d red-l)) - (red-lc (if (eq variant 'light) red-l red-d)) - (magenta-hc (if (eq variant 'light) magenta-d magenta-l)) - (magenta-lc (if (eq variant 'light) magenta-l magenta-d)) - (violet-hc (if (eq variant 'light) violet-d violet-l)) - (violet-lc (if (eq variant 'light) violet-l violet-d)) - (blue-hc (if (eq variant 'light) blue-d blue-l)) - (blue-lc (if (eq variant 'light) blue-l blue-d)) - (cyan-hc (if (eq variant 'light) cyan-d cyan-l)) - (cyan-lc (if (eq variant 'light) cyan-l cyan-d)) - (green-hc (if (eq variant 'light) green-d green-l)) - (green-lc (if (eq variant 'light) green-l green-d)) - - ;; customize based face properties - (s-maybe-bold (if solarized-use-less-bold - 'unspecified 'bold)) - (s-maybe-italic (if solarized-use-more-italic - 'italic 'normal)) - (s-variable-pitch (if solarized-use-variable-pitch - 'variable-pitch 'default)) - (s-fringe-bg (if solarized-distinct-fringe-background - base02 base03)) - (s-fringe-fg base01) - - - (s-header-line-fg (if solarized-high-contrast-mode-line - base1 base0)) - (s-header-line-bg (if solarized-high-contrast-mode-line - base02 base03)) - (s-header-line-underline (if solarized-high-contrast-mode-line - nil base02)) - - (s-mode-line-fg (if solarized-high-contrast-mode-line - base03 base0)) - (s-mode-line-bg (if solarized-high-contrast-mode-line - base0 base02)) - (s-mode-line-underline (if solarized-high-contrast-mode-line - nil s-line)) - - (s-mode-line-buffer-id-fg (if solarized-high-contrast-mode-line - 'unspecified base1)) - (s-mode-line-inactive-fg (if solarized-high-contrast-mode-line - base0 base01)) - (s-mode-line-inactive-bg (if solarized-high-contrast-mode-line - base02 base03)) - (s-mode-line-inactive-bc (if solarized-high-contrast-mode-line - base02 base02))) + (solarized-with-color-variables variant ;;; Theme Faces (custom-theme-set-faces theme-name ;;;; Built-in -;;;;; basic coloring - `(default ((,class (:foreground ,base0 :background ,base03)))) - `(shadow ((,class (:foreground ,base01)))) - `(match ((,class (:background ,base02 :foreground ,base1 :weight bold)))) +;;;;; basic faces + '(button ((t (:underline t)))) `(cursor ((,class (:foreground ,base03 :background ,base0 :inverse-video t)))) + `(default ((,class (:foreground ,base0 :background ,base03)))) + `(error ((,class (:foreground ,orange)))) `(escape-glyph ((,class (:foreground ,violet)))) `(fringe ((,class (:foreground ,s-fringe-fg :background ,s-fringe-bg)))) + `(header-line + ((,class (:inverse-video unspecified + :overline nil + :underline ,s-header-line-underline + :foreground ,s-header-line-fg + :background ,s-header-line-bg + :box (:line-width 2 :color ,s-header-line-bg + :style unspecified))))) `(highlight ((,class (:background ,base02)))) + `(lazy-highlight ((,class (:foreground ,base03 :background ,yellow + :weight normal)))) `(link ((,class (:foreground ,yellow :underline t :weight bold)))) `(link-visited ((,class (:foreground ,yellow :underline t :weight normal)))) + `(match ((,class (:background ,base02 :foreground ,base1 :weight bold)))) + `(menu ((,class (:foreground ,base0 :background ,base03)))) + `(minibuffer-prompt ((,class (:foreground ,base0)))) + `(mode-line + ((,class (:inverse-video unspecified + :overline ,s-mode-line-bg + :underline ,s-mode-line-underline + :foreground ,s-mode-line-fg + :background ,s-mode-line-bg + :box (:line-width 1 :color ,s-mode-line-bg + :style unspecified))))) + `(mode-line-buffer-id ((,class (:foreground ,s-mode-line-buffer-id-fg :weight bold)))) + `(mode-line-inactive + ((,class (:inverse-video unspecified + :overline ,s-mode-line-inactive-bc + :underline ,s-mode-line-underline + :foreground ,s-mode-line-inactive-fg + :background ,s-mode-line-inactive-bg + :box (:line-width 1 :color ,s-mode-line-inactive-bg + :style unspecified))))) + `(region ((,class (:foreground ,base03 :background ,base1)))) + `(secondary-selection ((,class (:background ,base02)))) + `(shadow ((,class (:foreground ,base01)))) `(success ((,class (:foreground ,green )))) + `(trailing-whitespace ((,class (:background ,red)))) + `(vertical-border ((,class (:foreground ,s-line)))) `(warning ((,class (:foreground ,yellow )))) - `(error ((,class (:foreground ,orange)))) - `(lazy-highlight ((,class (:foreground ,base03 :background ,yellow - :weight normal)))) - `(widget-field ((,class (:background ,base02)))) - '(button ((t (:underline t)))) ;;;;; compilation `(compilation-column-face ((,class (:foreground ,cyan :underline nil)))) `(compilation-column-number ((,class (:inherit font-lock-doc-face :foreground ,cyan @@ -317,12 +341,23 @@ `(compilation-mode-line-fail ((,class (:inherit compilation-error :foreground ,red :weight bold)))) `(compilation-mode-line-run ((,class (:foreground ,orange :weight bold)))) +;;;;; completions + `(completions-annotations ((t (:foreground ,base01)))) ;;;;; cua `(cua-global-mark ((,class (:background ,yellow :foreground ,base03)))) `(cua-rectangle ((,class (:inherit region :background ,magenta :foreground ,base03)))) `(cua-rectangle-noselect ((,class (:inherit region :background ,base02 :foreground ,base01)))) +;;;;; debbugs + `(debbugs-gnu-archived ((,class (:inverse-video t)))) + `(debbugs-gnu-done ((,class (:foreground ,base01)))) + `(debbugs-gnu-handled ((,class (:foreground ,green)))) + `(debbugs-gnu-new ((,class (:foreground ,blue)))) + `(debbugs-gnu-pending ((,class (:foreground ,cyan)))) + `(debbugs-gnu-stale ((,class (:foreground ,yellow)))) + `(debbugs-gnu-tagged ((,class (:foreground ,base1 :weight bold)))) + ;;;;; diary `(diary ((,class (:foreground ,yellow)))) ;;;;; dired @@ -336,9 +371,10 @@ `(dired-symlink ((,class (:foreground ,cyan :weight normal :slant italic)))) `(dired-warning ((,class (:foreground ,orange :underline t)))) ;;;;; dired-async - `(dired-async-message ((,class (:background ,(if (eq variant 'light) yellow-l yellow) )))) - `(dired-async-mode-message - ((,class (:background ,(if (eq variant 'light) red-l red) )))) + `(dired-async-message ((,light-class (:background ,yellow-l )) + (,dark-class (:background ,yellow )))) + `(dired-async-mode-message ((,light-class (:background ,red-l)) + (,dark-class (:background ,red)))) ;;;;; dired-efap `(dired-efap-face ((,class (:box nil :background ,base02 @@ -384,8 +420,6 @@ `(enh-ruby-op-face ((,class (:foreground ,base0)))) `(erm-syn-errline ((,class (:inherit flymake-errline)))) `(erm-syn-warnline ((,class (:inherit flymake-warnline)))) -;;;;; completions - `(completions-annotations ((t (:foreground ,base01)))) ;;;;; grep `(grep-context-face ((,class (:foreground ,base0)))) `(grep-error-face ((,class (:foreground ,red :weight bold :underline t)))) @@ -398,42 +432,8 @@ `(Man-overstrike ((,class (:foreground ,blue :weight bold)))) `(Man-reverse ((,class (:foreground ,orange)))) `(Man-underline ((,class (:foreground ,green :underline t)))) -;;;;; misc faces - `(menu ((,class (:foreground ,base0 :background ,base03)))) - `(minibuffer-prompt ((,class (:foreground ,base0)))) - `(mode-line - ((,class (:inverse-video unspecified - :overline ,s-mode-line-bg - :underline ,s-mode-line-underline - :foreground ,s-mode-line-fg - :background ,s-mode-line-bg - :box (:line-width 1 :color ,s-mode-line-bg - :style unspecified) - )))) - `(mode-line-buffer-id ((,class (:foreground ,s-mode-line-buffer-id-fg :weight bold)))) - `(mode-line-inactive - ((,class (:inverse-video unspecified - :overline ,s-mode-line-inactive-bc - :underline ,s-mode-line-underline - :foreground ,s-mode-line-inactive-fg - :background ,s-mode-line-inactive-bg - :box (:line-width 1 :color ,s-mode-line-inactive-bg - :style unspecified) - )))) - `(header-line - ((,class (:inverse-video unspecified - :overline nil - :underline ,s-header-line-underline - :foreground ,s-header-line-fg - :background ,s-header-line-bg - :box (:line-width 2 :color ,s-header-line-bg - :style unspecified) - )))) - `(region ((,class (:foreground ,base03 :background ,base1)))) - `(secondary-selection ((,class (:background ,base02)))) - - `(trailing-whitespace ((,class (:background ,red)))) - `(vertical-border ((,class (:foreground ,s-line)))) +;;;;; wid-edit + `(widget-field ((,class (:background ,base02)))) ;;;;; font lock `(font-lock-builtin-face ((,class (:foreground ,base0 :weight ,s-maybe-bold :slant ,s-maybe-italic)))) @@ -461,6 +461,52 @@ :inverse-video nil)))) `(ace-jump-face-foreground ((,class (:foreground ,red :background ,base03 :inverse-video nil :weight bold)))) +;;;;; all-the-icons, all-the-icons-dired, spaceline-all-the-icons + `(spaceline-all-the-icons-info-face ((,class (:foreground ,blue)))) + `(spaceline-all-the-icons-sunrise-face ((,class (:foreground ,yellow)))) + `(spaceline-all-the-icons-sunrise-face ((,class (:foreground ,orange)))) + `(all-the-icons-dired-dir-face ((,class (:foreground ,base0)))) + `(all-the-icons-red ((,class (:foreground ,red)))) + `(all-the-icons-lred ((,class (:foreground ,red-lc)))) + `(all-the-icons-dred ((,class (:foreground ,red-hc)))) + `(all-the-icons-red-alt ((,class (:foreground ,red)))) + `(all-the-icons-green ((,class (:foreground ,green)))) + `(all-the-icons-lgreen ((,class (:foreground ,green-lc)))) + `(all-the-icons-dgreen ((,class (:foreground ,green-hc)))) + `(all-the-icons-yellow ((,class (:foreground ,yellow)))) + `(all-the-icons-lyellow ((,class (:foreground ,yellow-lc)))) + `(all-the-icons-dyellow ((,class (:foreground ,yellow-hc)))) + `(all-the-icons-blue ((,class (:foreground ,blue)))) + `(all-the-icons-blue-alt ((,class (:foreground ,blue)))) + `(all-the-icons-lblue ((,class (:foreground ,blue-lc)))) + `(all-the-icons-dblue ((,class (:foreground ,blue-hc)))) + `(all-the-icons-maroon ((,class (:foreground ,magenta-d)))) + `(all-the-icons-lmaroon ((,class (:foreground ,magenta-d)))) + `(all-the-icons-dmaroon ((,class (:foreground ,magenta-d)))) + `(all-the-icons-purple ((,class (:foreground ,violet)))) + `(all-the-icons-lpurple ((,class (:foreground ,violet-lc)))) + `(all-the-icons-dpurple ((,class (:foreground ,violet-hc)))) + `(all-the-icons-orange ((,class (:foreground ,orange)))) + `(all-the-icons-lorange ((,class (:foreground ,orange-lc)))) + `(all-the-icons-dorange ((,class (:foreground ,orange-hc)))) + `(all-the-icons-cyan ((,class (:foreground ,cyan)))) + `(all-the-icons-cyan-alt ((,class (:foreground ,cyan)))) + `(all-the-icons-lcyan ((,class (:foreground ,cyan-lc)))) + `(all-the-icons-dcyan ((,class (:foreground ,cyan-hc)))) + `(all-the-icons-pink ((,class (:foreground ,magenta)))) + `(all-the-icons-lpink ((,class (:foreground ,magenta-lc)))) + `(all-the-icons-dpink ((,class (:foreground ,magenta-hc)))) + `(all-the-icons-silver ((,class (:foreground ,base0)))) + `(all-the-icons-lsilver ((,class (:foreground ,base01)))) + `(all-the-icons-dsilver ((,class (:foreground ,base1)))) +;;;;; android-mode + `(android-mode-debug-face ((,class (:foreground ,green)))) + `(android-mode-error-face ((,class (:foreground ,orange :weight bold)))) + `(android-mode-info-face ((,class (:foreground ,base0)))) + `(android-mode-verbose-face ((,class (:foreground ,base01)))) + `(android-mode-warning-face ((,class (:foreground ,yellow)))) +;;;;; anzu-mode + `(anzu-mode-line ((,class (:foreground ,yellow :weight bold)))) ;;;;; auctex `(font-latex-bold-face ((,class (:inherit bold :foreground ,base1)))) `(font-latex-doctex-documentation-face ((,class (:background unspecified)))) @@ -500,7 +546,9 @@ `(ac-gtags-selection-face ((,class (:background ,blue-lc :foreground ,blue-hc)))) `(ac-yasnippet-candidate-face ((,class (:background ,base02 :foreground ,yellow)))) `(ac-yasnippet-selection-face ((,class (:background ,yellow-lc :foreground ,yellow-hc)))) -;;;;; auto highlight symbol +;;;;; auto-dim-other-buffers + `(auto-dim-other-buffers-face ((,class (:background ,base02)))) +;;;;; auto-highlight-symbol `(ahs-definition-face ((,class (:foreground ,magenta :background unspecified :slant normal)))) `(ahs-edit-mode-face ((,class (:foreground ,base03 :background ,magenta)))) @@ -509,14 +557,12 @@ `(ahs-plugin-defalt-face ((,class (:foreground ,magenta :background unspecified)))) `(ahs-plugin-whole-buffer-face ((,class (:foreground ,magenta :background unspecified)))) `(ahs-warning-face ((,class (:foreground ,red :weight bold)))) -;;;;; android mode - `(android-mode-debug-face ((,class (:foreground ,green)))) - `(android-mode-error-face ((,class (:foreground ,orange :weight bold)))) - `(android-mode-info-face ((,class (:foreground ,base0)))) - `(android-mode-verbose-face ((,class (:foreground ,base01)))) - `(android-mode-warning-face ((,class (:foreground ,yellow)))) -;;;;; anzu-mode - `(anzu-mode-line ((,class (:foreground ,yellow :weight bold)))) +;;;;; avy-mode + `(avy-lead-face ((,class (:inherit isearch)))) + `(avy-lead-face-0 ((,class (:inherit isearch :background ,violet)))) + `(avy-lead-face-1 ((,class (:inherit isearch :background ,orange)))) + `(avy-lead-face-2 ((,class (:inherit isearch :background ,cyan)))) + `(avy-background-face ((,class (:inherit font-lock-comment-face)))) ;;;;; bm `(bm-face ((,class (:overline ,base0)))) `(bm-fringe-face ((,class (:overline ,base0)))) @@ -546,31 +592,49 @@ :weight bold)))) `(cfw:face-toolbar-button-on ((,class (:background ,yellow-hc :foreground ,yellow-lc :weight bold)))) -;;;;; clojure-test-mode - `(clojure-test-failure-face ((t (:foreground ,orange :weight bold :underline t)))) - `(clojure-test-error-face ((t (:foreground ,red :weight bold :underline t)))) - `(clojure-test-success-face ((t (:foreground ,green :weight bold :underline t)))) +;;;;; cider + `(cider-result-overlay-face ((t (:background unspecified)))) + `(cider-enlightened-face ((t (:box (:color ,magenta :line-width -1))))) + `(cider-enlightened-local-face ((t (:weight bold :foreground ,green-l)))) + `(cider-deprecated-face ((t (:underline (:color ,yellow))))) + `(cider-instrumented-face ((t (:box (:color ,red-l :line-width -1))))) + `(cider-traced-face ((t (:box (:color ,cyan :line-width -1))))) + `(cider-fringe-good-face ((t (:foreground ,green-l)))) ;;;;; cider-repl-mode `(cider-repl-err-output-face ((t (:inherit ,font-lock-warning-face :underline nil)))) ;;;;; cider-test-mode `(cider-test-failure-face ((t (:foreground ,orange :weight bold :underline t)))) `(cider-test-error-face ((t (:foreground ,red :weight bold :underline t)))) `(cider-test-success-face ((t (:foreground ,green :weight bold :underline t)))) -;;;;; company-mode - `(company-template-field ((,class (:background ,yellow :foreground ,base02)))) - `(company-tooltip ((,class (:background ,base02 :foreground ,cyan)))) - `(company-tooltip-selection ((,class (:background ,cyan-lc :foreground ,cyan-hc)))) - `(company-tooltip-mouse ((,class (:background ,cyan-hc :foreground ,cyan-lc)))) - `(company-tooltip-common ((,class (:foreground ,base1 :underline t)))) - `(company-tooltip-common-selection ((,class (:foreground ,base1 :underline t)))) - `(company-tooltip-annotation ((,class (:foreground ,base1 :background ,base02)))) - `(company-scrollbar-fg ((,class (:foreground ,base03 :background ,base0)))) - `(company-scrollbar-bg ((,class (:background ,base02 :foreground ,cyan)))) - `(company-preview ((,class (:background ,base02 :foreground ,cyan)))) - `(company-preview-common ((,class (:foreground ,base1 :underline t)))) +;;;;; coffee + `(coffee-mode-class-name ((,class (:foreground ,yellow :weight bold)))) + `(coffee-mode-function-param ((,class (:foreground ,violet :slant italic)))) ;;;;; column-enforce-mode `(column-enforce-face ((,class (:background unspecified :foreground ,magenta :inverse-video unspecified)))) +;;;;; company-mode + `(company-echo ((,class nil))) + `(company-echo-common ((,class (:background ,red)))) + `(company-preview ((,class (:background ,base02 :foreground ,base1)))) + `(company-preview-common ((,class (:foreground ,base1)))) + `(company-preview-search ((,class (:foreground ,magenta)))) + `(company-scrollbar-bg ((,class (:background ,base02 :foreground ,cyan)))) + `(company-scrollbar-fg ((,class (:foreground ,base03 :background ,base0)))) + `(company-template-field ((,class (:background ,yellow :foreground ,base02)))) + `(company-tooltip ((,class (:foreground ,base1 :background ,base02)))) + `(company-tooltip-annotation ((,class (:foreground ,cyan)))) + `(company-tooltip-annotation-selection ((,class (:foreground ,cyan)))) + `(company-tooltip-common ((,class (:foreground ,base0)))) + `(company-tooltip-common-selection ((,class (:weight bold)))) + `(company-tooltip-mouse ((,class (:background ,cyan-hc :foreground ,cyan-lc)))) + `(company-tooltip-search ((,class (:foreground ,magenta)))) + `(company-tooltip-search-selection ((,class (:foreground ,magenta :weight bold)))) + `(company-tooltip-selection ((,class (:weight bold)))) + +;;;;; cperl-mode + `(cperl-array-face ((,class (:background unspecified :foreground ,blue)))) + `(cperl-hash-face ((,class (:background unspecified :foreground ,blue)))) + `(cperl-nonoverridable-face ((,class (:foreground ,base0 :weight bold)))) ;;;;; cscope `(cscope-file-face ((,class (:foreground ,green :weight bold)))) `(cscope-function-face ((,class (:foreground ,blue)))) @@ -583,15 +647,6 @@ `(ctbl:face-continue-bar ((,class (:background ,base02 :foreground ,yellow)))) `(ctbl:face-row-select ((,class (:background ,base02 :foreground ,base0 :underline t)))) -;;;;; coffee - `(coffee-mode-class-name ((,class (:foreground ,yellow :weight bold)))) - `(coffee-mode-function-param ((,class (:foreground ,violet :slant italic)))) - -;;;;; cperl-mode - `(cperl-array-face ((,class (:background unspecified :foreground ,blue)))) - `(cperl-hash-face ((,class (:background unspecified :foreground ,blue)))) - `(cperl-nonoverridable-face ((,class (:foreground ,base0 :weight bold)))) - ;;;;; custom `(custom-face-tag ((,class (:inherit ,s-variable-pitch :height ,solarized-height-plus-3 :foreground ,violet :weight normal)))) @@ -614,23 +669,28 @@ `(diff-changed ((,class (:foreground ,blue)))) `(diff-removed ((,class (:foreground ,red)))) `(diff-refine-added - ((((class color) (background light)) + ((,light-class (:background ,(solarized-color-blend "#ddffdd" green 0.7))) - (((class color) (background dark)) + (,dark-class (:background ,(solarized-color-blend "#446644" green 0.7))))) `(diff-refine-changed - ((((class color) (background light)) + ((,light-class (:background ,(solarized-color-blend "#ddddff" blue 0.7))) - (((class color) (background dark)) + (,dark-class (:background ,(solarized-color-blend "#444466" blue 0.7))))) `(diff-refine-removed - ((((class color) (background light)) + ((,light-class (:background ,(solarized-color-blend "#ffdddd" red 0.7))) - (((class color) (background dark)) + (,dark-class (:background ,(solarized-color-blend "#664444" red 0.7))))) `(diff-header ((,class (:background ,base03)))) `(diff-file-header ((,class (:background ,base03 :foreground ,base0 :weight bold)))) +;;;;; diff-hl + `(diff-hl-change ((,class (:background ,blue-lc :foreground ,blue-hc)))) + `(diff-hl-delete ((,class (:background ,red-lc :foreground ,red-hc)))) + `(diff-hl-insert ((,class (:background ,green-lc :foreground ,green-hc)))) + `(diff-hl-unknown ((,class (:background ,cyan-lc :foreground ,cyan-hc)))) ;;;;; ediff `(ediff-fine-diff-A ((,class (:background ,orange-lc)))) `(ediff-fine-diff-B ((,class (:background ,green-lc)))) @@ -717,28 +777,31 @@ ;; `(ediff-odd-diff-C ((,class (:background ,base01 ;; :foreground ,base03 ;; )))) -;;;;; diff-hl - `(diff-hl-change ((,class (:background ,blue-lc :foreground ,blue-hc)))) - `(diff-hl-delete ((,class (:background ,red-lc :foreground ,red-hc)))) - `(diff-hl-insert ((,class (:background ,green-lc :foreground ,green-hc)))) - `(diff-hl-unknown ((,class (:background ,cyan-lc :foreground ,cyan-hc)))) ;;;;; edts `(edts-face-error-line - ((,(append '((supports :underline (:style line))) class) - (:underline (:style line :color ,(if (eq variant 'light) red-l red)) :inherit unspecified)) + ((,(append '((supports :underline (:style line))) light-class) + (:underline (:style line :color ,red-l) :inherit unspecified)) + (,(append '((supports :underline (:style line))) dark-class) + (:underline (:style line :color ,red) :inherit unspecified)) (,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t)))) `(edts-face-warning-line - ((,(append '((supports :underline (:style line))) class) - (:underline (:style line :color ,(if (eq variant 'light) yellow-l yellow)) :inherit unspecified)) + ((,(append '((supports :underline (:style line))) light-class) + (:underline (:style line :color ,yellow-l) :inherit unspecified)) + (,(append '((supports :underline (:style line))) dark-class) + (:underline (:style line :color ,yellow) :inherit unspecified)) (,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t)))) `(edts-face-error-fringe-bitmap - ((,class (:foreground ,(if (eq variant 'light) red-l red) :background unspecified :weight bold)))) + ((,light-class (:foreground ,red-l :background unspecified :weight bold)) + (,dark-class (:foreground ,red :background unspecified :weight bold)))) `(edts-face-warning-fringe-bitmap - ((,class (:foreground ,(if (eq variant 'light) yellow-l yellow) :background unspecified :weight bold)))) + ((,light-class (:foreground ,yellow-l :background unspecified :weight bold)) + (,dark-class (:foreground ,yellow :background unspecified :weight bold)))) `(edts-face-error-mode-line - ((,class (:background ,(if (eq variant 'light) red-l red) :foreground unspecified)))) + ((,light-class (:background ,red-l :foreground unspecified)) + (,dark-class (:background ,red :foreground unspecified)))) `(edts-face-warning-mode-line - ((,class (:background ,(if (eq variant 'light) yellow-l yellow) :foreground unspecified)))) + ((,light-class (:background ,yellow-l :foreground unspecified)) + (,dark-class (:background ,yellow :foreground unspecified)))) ;;;;; elfeed `(elfeed-search-date-face ((,class (:foreground ,base01)))) `(elfeed-search-feed-face ((,class (:foreground ,base01)))) @@ -760,6 +823,29 @@ ;;;;; epc `(epc:face-title ((,class (:foreground ,blue :background ,base03 :weight normal :underline nil)))) +;;;;; erc + `(erc-action-face ((,class (:inherit erc-default-face)))) + `(erc-bold-face ((,class (:weight bold)))) + `(erc-current-nick-face ((,class (:foreground ,blue :weight bold)))) + `(erc-dangerous-host-face ((,class (:inherit font-lock-warning-face)))) + `(erc-default-face ((,class (:foreground ,base0)))) + `(erc-highlight-face ((,class (:inherit erc-default-face + :background ,base02)))) + `(erc-direct-msg-face ((,class (:inherit erc-default-face)))) + `(erc-error-face ((,class (:inherit font-lock-warning-face)))) + `(erc-fool-face ((,class (:inherit erc-default-face)))) + `(erc-input-face ((,class (:foreground ,yellow)))) + `(erc-keyword-face ((,class (:foreground ,blue :weight bold)))) + `(erc-nick-default-face ((,class (:foreground ,yellow :weight bold)))) + `(erc-my-nick-face ((,class (:foreground ,red :weight bold)))) + `(erc-nick-msg-face ((,class (:inherit erc-default-face)))) + `(erc-notice-face ((,class (:foreground ,green)))) + `(erc-pal-face ((,class (:foreground ,orange :weight bold)))) + `(erc-prompt-face ((,class (:foreground ,orange :background ,base03 :weight bold)))) + `(erc-timestamp-face ((,class (:foreground ,green)))) + `(erc-underline-face ((t (:underline t)))) +;;;;; eros + `(eros-result-overlay-face ((t (:background unspecified)))) ;;;;; eshell `(eshell-prompt ((,class (:foreground ,yellow :weight bold)))) `(eshell-ls-archive ((,class (:foreground ,red :weight bold)))) @@ -773,37 +859,22 @@ `(eshell-ls-special ((,class (:foreground ,yellow :weight bold)))) `(eshell-ls-symlink ((,class (:foreground ,cyan :weight bold)))) ;;;;; evil-search-highlight-persist - `(evil-search-highlight-persist-highlight-face ((,class (:background ,(if (eq variant 'light) green-lc violet-lc))))) + `(evil-search-highlight-persist-highlight-face ((,light-class (:background ,green-lc)) + (,dark-class (:background ,violet-lc)))) ;;;;; fic `(fic-author-face ((,class (:background ,base03 :foreground ,orange :underline t :slant italic)))) `(fic-face ((,class (:background ,base03 :foreground ,orange :weight normal :slant italic)))) `(font-lock-fic-face ((,class (:background ,base03 :foreground ,orange - :weight normal :slant italic)))) + :weight normal :slant italic)))) ;;;;; fixmee `(fixmee-notice-face ((,class (:background nil :foreground ,base1 - :underline nil :slant italic :weight bold)))) + :underline nil :slant italic :weight bold)))) ;;;;; flx `(flx-highlight-face ((,class (:foreground ,blue :weight normal :underline nil)))) -;;;;; flymake - `(flymake-errline - ((,(append '((supports :underline (:style wave))) class) - (:underline (:style wave :color ,red) :inherit unspecified - :foreground unspecified :background unspecified)) - (,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t)))) - `(flymake-infoline - ((,(append '((supports :underline (:style wave))) class) - (:underline (:style wave :color ,green) :inherit unspecified - :foreground unspecified :background unspecified)) - (,class (:foreground ,green-hc :background ,green-lc)))) - `(flymake-warnline - ((,(append '((supports :underline (:style wave))) class) - (:underline (:style wave :color ,yellow) :inherit unspecified - :foreground unspecified :background unspecified)) - (,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t)))) ;;;;; flycheck `(flycheck-error ((,(append '((supports :underline (:style wave))) class) @@ -833,6 +904,22 @@ blue-hc base01) :background ,(if solarized-emphasize-indicators blue-lc base03) :weight bold)))) +;;;;; flymake + `(flymake-errline + ((,(append '((supports :underline (:style wave))) class) + (:underline (:style wave :color ,red) :inherit unspecified + :foreground unspecified :background unspecified)) + (,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t)))) + `(flymake-infoline + ((,(append '((supports :underline (:style wave))) class) + (:underline (:style wave :color ,green) :inherit unspecified + :foreground unspecified :background unspecified)) + (,class (:foreground ,green-hc :background ,green-lc)))) + `(flymake-warnline + ((,(append '((supports :underline (:style wave))) class) + (:underline (:style wave :color ,yellow) :inherit unspecified + :foreground unspecified :background unspecified)) + (,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t)))) ;;;;; flyspell `(flyspell-duplicate ((,(append '((supports :underline (:style wave))) class) @@ -842,42 +929,29 @@ ((,(append '((supports :underline (:style wave))) class) (:underline (:style wave :color ,red) :inherit unspecified)) (,class (:foreground ,red :weight bold :underline t)))) -;;;;; erc - `(erc-action-face ((,class (:inherit erc-default-face)))) - `(erc-bold-face ((,class (:weight bold)))) - `(erc-current-nick-face ((,class (:foreground ,blue :weight bold)))) - `(erc-dangerous-host-face ((,class (:inherit font-lock-warning-face)))) - `(erc-default-face ((,class (:foreground ,base0)))) - `(erc-highlight-face ((,class (:inherit erc-default-face - :background ,base02)))) - `(erc-direct-msg-face ((,class (:inherit erc-default-face)))) - `(erc-error-face ((,class (:inherit font-lock-warning-face)))) - `(erc-fool-face ((,class (:inherit erc-default-face)))) - `(erc-input-face ((,class (:foreground ,yellow)))) - `(erc-keyword-face ((,class (:foreground ,blue :weight bold)))) - `(erc-nick-default-face ((,class (:foreground ,yellow :weight bold)))) - `(erc-my-nick-face ((,class (:foreground ,red :weight bold)))) - `(erc-nick-msg-face ((,class (:inherit erc-default-face)))) - `(erc-notice-face ((,class (:foreground ,green)))) - `(erc-pal-face ((,class (:foreground ,orange :weight bold)))) - `(erc-prompt-face ((,class (:foreground ,orange :background ,base03 :weight bold)))) - `(erc-timestamp-face ((,class (:foreground ,green)))) - `(erc-underline-face ((t (:underline t)))) +;;;;; form-feed + `(form-feed-line + ((,class (:strike-through ,s-line)))) ;;;;; git-commit `(git-commit-comment-action ((,class (:foreground ,base0 :weight bold)))) - `(git-commit-comment-branch ((,class (:foreground ,blue :weight bold)))) + `(git-commit-comment-branch ; obsolete + ((,class (:foreground ,blue :weight bold)))) + `(git-commit-comment-branch-local + ((,class (:foreground ,blue :weight bold)))) + `(git-commit-comment-branch-remote + ((,class (:foreground ,green :weight bold)))) `(git-commit-comment-heading ((,class (:foreground ,yellow :weight bold)))) ;;;;; git-gutter `(git-gutter:added - ((,class (:weight normal - :foreground ,(if solarized-emphasize-indicators - green s-fringe-fg) + ((,class (:weight normal + :foreground ,(if solarized-emphasize-indicators + green s-fringe-fg) :background ,s-fringe-bg )))) `(git-gutter:deleted - ((,class (:weight normal - :foreground ,(if solarized-emphasize-indicators - red s-fringe-fg) + ((,class (:weight normal + :foreground ,(if solarized-emphasize-indicators + red s-fringe-fg) :background ,s-fringe-bg )))) `(git-gutter:modified @@ -911,30 +985,9 @@ `(git-gutter-fr+-modified ((,class (:foreground ,blue :weight bold)))) ;;;;; git-rebase `(git-rebase-hash ((,class (:foreground ,base01)))) -;;;;; go-direx - `(go-direx-header ((,class (:foreground ,blue)))) - `(go-direx-label ((,class (:foreground ,green)))) - `(go-direx-package ((,class (:foreground ,base1 :weight bold)))) - -;;;;;; go-mode - `(go-coverage-0 ((,class (:foreground ,orange)))) - `(go-coverage-1 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 2.0 6)))))) - `(go-coverage-2 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 3.0 6)))))) - `(go-coverage-3 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 4.0 6)))))) - `(go-coverage-4 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 5.0 6)))))) - `(go-coverage-5 ((,class (:foreground ,blue)))) - `(go-coverage-6 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 2.0 6)))))) - `(go-coverage-7 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 3.0 6)))))) - `(go-coverage-8 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 4.0 6)))))) - `(go-coverage-9 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 5.0 6)))))) - `(go-coverage-10 ((,class (:foreground ,cyan)))) - `(go-coverage-covered ((,class (:foreground ,green)))) - `(go-coverage-untracked ((,class (:foreground ,base01)))) - -;;;;; guide-key - `(guide-key/highlight-command-face ((,class (:foreground ,blue)))) - `(guide-key/key-face ((,class (:foreground ,base01)))) - `(guide-key/prefix-command-face ((,class (:foreground ,green)))) +;;;;; git-timemachine + `(git-timemachine-minibuffer-author-face ((,class (:foreground ,orange)))) + `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,yellow)))) ;;;;; gnus `(gnus-group-mail-1 ((,class (:weight bold :inherit gnus-group-mail-1-empty)))) `(gnus-group-mail-1-empty ((,class (:inherit gnus-group-news-1-empty)))) @@ -990,6 +1043,30 @@ `(gnus-group-news-low-empty ((,class (:foreground ,base01)))) `(gnus-signature ((,class (:foreground ,yellow)))) `(gnus-x-face ((,class (:background ,base0 :foreground ,base03)))) +;;;;; go-direx + `(go-direx-header ((,class (:foreground ,blue)))) + `(go-direx-label ((,class (:foreground ,green)))) + `(go-direx-package ((,class (:foreground ,base1 :weight bold)))) +;;;;; go-guru + `(go-guru-hl-identifier-face ((,class (:foreground ,magenta)))) +;;;;; go-mode + `(go-coverage-0 ((,class (:foreground ,orange)))) + `(go-coverage-1 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 2.0 6)))))) + `(go-coverage-2 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 3.0 6)))))) + `(go-coverage-3 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 4.0 6)))))) + `(go-coverage-4 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 5.0 6)))))) + `(go-coverage-5 ((,class (:foreground ,blue)))) + `(go-coverage-6 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 2.0 6)))))) + `(go-coverage-7 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 3.0 6)))))) + `(go-coverage-8 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 4.0 6)))))) + `(go-coverage-9 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 5.0 6)))))) + `(go-coverage-10 ((,class (:foreground ,cyan)))) + `(go-coverage-covered ((,class (:foreground ,green)))) + `(go-coverage-untracked ((,class (:foreground ,base01)))) +;;;;; guide-key + `(guide-key/highlight-command-face ((,class (:foreground ,blue)))) + `(guide-key/key-face ((,class (:foreground ,base01)))) + `(guide-key/prefix-command-face ((,class (:foreground ,green)))) ;;;;; helm ;; These probably needs tweaking. `(helm-apt-deinstalled ((,class (:foreground ,base01)))) @@ -1020,6 +1097,7 @@ `(helm-grep-match ((,class (:inherit match)))) `(helm-grep-running ((,class (:foreground ,red)))) `(helm-header ((,class (:inherit header-line)))) + `(helm-header-line-left-margin ((,class (:inherit header-line)))) `(helm-lisp-completion-info ((,class (:foreground ,base0)))) `(helm-lisp-show-completion ((,class (:foreground ,yellow :background ,base02 :bold t)))) @@ -1053,11 +1131,11 @@ `(hi-yellow ((,class (:foreground ,(solarized-color-blend yellow base1 0.5) :background,(solarized-color-blend yellow base03 0.15))))) `(hi-pink ((,class (:foreground ,(solarized-color-blend magenta base1 0.5) - :background,(solarized-color-blend magenta base03 0.15))))) + :background,(solarized-color-blend magenta base03 0.15))))) `(hi-green ((,class (:foreground ,(solarized-color-blend green base1 0.5) - :background,(solarized-color-blend green base03 0.15))))) + :background,(solarized-color-blend green base03 0.15))))) `(hi-blue ((,class (:foreground ,(solarized-color-blend blue base1 0.5) - :background,(solarized-color-blend blue base03 0.15))))) + :background,(solarized-color-blend blue base03 0.15))))) `(hi-black-b ((,class (:foreground ,base1 :background ,base03 :weight bold)))) @@ -1065,8 +1143,8 @@ :foreground ,(solarized-color-blend cyan base1 0.7) :background ,(solarized-color-blend cyan base03 0.2))))) `(hi-green-b ((,class (:weight bold - :foreground ,(solarized-color-blend green base1 0.7) - :background ,(solarized-color-blend green base03 0.2))))) + :foreground ,(solarized-color-blend green base1 0.7) + :background ,(solarized-color-blend green base03 0.2))))) `(hi-red-b ((,class (:weight bold :foreground ,(solarized-color-blend red base1 0.7) :background ,(solarized-color-blend red base03 0.2))))) @@ -1079,6 +1157,8 @@ ;;;;; highlight-indentation `(highlight-indentation-face ((,class (:background ,base02)))) `(highlight-indentation-current-column-face((,class (:background ,base02)))) +;;;;; highlight-numbers + `(highlight-numbers-number ((,class (:foreground ,violet :bold nil)))) ;;;;; highlight-symbol `(highlight-symbol-face ((,class (:foreground ,magenta)))) ;;;;; hl-line-mode @@ -1097,6 +1177,13 @@ `(ido-incomplete-regexp ((,class (:foreground ,red :weight bold )))) `(ido-indicator ((,class (:background ,red :foreground ,base03 :width condensed)))) `(ido-virtual ((,class (:foreground ,cyan)))) +;;;;; iedit-mode + `(iedit-occurrence ((,class (:background ,base03 :foreground ,magenta :bold t)))) +;;;;; imenu-list + `(imenu-list-entry-face-0 ((,class (:inherit font-lock-type-face)))) + `(imenu-list-entry-face-1 ((,class (:inherit font-lock-function-name-face)))) + `(imenu-list-entry-face-2 ((,class (:inherit font-lock-variable-name-face)))) + `(imenu-list-entry-face-3 ((,class (:inherit font-lock-string-face)))) ;;;;; info `(info-title-1 ((,class (:foreground ,base1 :weight bold)))) `(info-title-2 ((,class (:foreground ,base1 :weight bold)))) @@ -1137,6 +1224,15 @@ ((,class (:foreground ,magenta :background ,base02)))) `(info-user-option-ref-item ((,class (:foreground ,orange :background ,base02)))) +;;;;; ivy + `(ivy-confirm-face ((,class (:foreground ,green)))) + `(ivy-current-match ((,class (:weight bold :background ,base02 :underline t)))) + `(ivy-match-required-face ((,class (:foreground ,red)))) + `(ivy-minibuffer-match-face-1 ((,class (:foreground ,base1)))) + `(ivy-minibuffer-match-face-2 ((,class (:foreground ,yellow)))) + `(ivy-minibuffer-match-face-3 ((,class (:foreground ,yellow)))) + `(ivy-minibuffer-match-face-4 ((,class (:foreground ,yellow)))) + `(ivy-remote ((,class (:foreground ,blue)))) ;;;;; jabber `(jabber-activity-face ((,class (:weight bold :foreground ,red)))) `(jabber-activity-personal-face ((,class (:weight bold :foreground ,blue)))) @@ -1154,7 +1250,9 @@ `(jabber-roster-user-offline ((,class (:foreground ,base01)))) `(jabber-roster-user-online ((,class (:weight bold :foreground ,blue)))) `(jabber-roster-user-xa ((,class (:slant italic :foreground ,magenta)))) -;;;;; js2-mode colors +;;;;; jedi + `(jedi:highlight-function-argument ((,class (:inherit bold)))) +;;;;; js2-mode `(js2-error ((,class (:foreground ,red)))) `(js2-external-variable ((,class (:foreground ,orange)))) `(js2-function-param ((,class (:foreground ,green)))) @@ -1168,8 +1266,20 @@ `(js2-private-function-call ((,class (:foreground ,yellow)))) `(js2-private-member ((,class (:foreground ,blue)))) `(js2-warning ((,class (:underline ,orange)))) -;;;;; jedi - `(jedi:highlight-function-argument ((,class (:inherit bold)))) +;;;;; js3-mode + `(js3-error ((,class (:foreground ,red)))) + `(js3-external-variable ((,class (:foreground ,orange)))) + `(js3-function-param ((,class (:foreground ,green)))) + `(js3-instance-member ((,class (:foreground ,magenta)))) + `(js3-jsdoc-html-tag-delimiter ((,class (:foreground ,cyan)))) + `(js3-jsdoc-html-tag-name ((,class (:foreground ,orange)))) + `(js3-jsdoc-tag ((,class (:foreground ,cyan)))) + `(js3-jsdoc-type ((,class (:foreground ,blue)))) + `(js3-jsdoc-value ((,class (:foreground ,violet)))) + `(js3-magic-paren ((,class (:underline t)))) + `(js3-private-function-call ((,class (:foreground ,yellow)))) + `(js3-private-member ((,class (:foreground ,blue)))) + `(js3-warning ((,class (:underline ,orange)))) ;;;;; kite ;; Sadly kite is not very stable for me so these faces might miss out things. `(bg:kite-dataReceived ((,class (:background ,magenta)))) @@ -1199,7 +1309,7 @@ `(kite-attribute-prefix-face ((,class (:inherit kite-name-face)))) `(kite-attribute-value-delimiter-face ((,class (:inherit kite-delimiter-face)))) `(kite-attribute-value-face ((,class (:inherit kite-delimited-data-face)))) - `(kite-boolean ((,class (:inherit nxml-char-ref-number)))) + `(kite-boolean ((,class (:inherit font-lock-constant-face)))) `(kite-cdata-section-CDATA-face ((,class (:inherit kite-name-face)))) `(kite-cdata-section-content-face ((,class (:inherit kite-text-face)))) `(kite-cdata-section-delimiter-face ((,class (:inherit kite-delimiter-face)))) @@ -1219,8 +1329,8 @@ `(kite-entity-ref-name-face ((,class (:inherit kite-ref-face)))) `(kite-hash-face ((,class (:inherit kite-name-face)))) `(kite-link-face ((,class (:inherit change-log-file)))) - `(kite-loading ((,class (:inherit font-lock-comment)))) - `(kite-log-debug ((,class (:inherit font-lock-comment)))) + `(kite-loading ((,class (:inherit font-lock-comment-face)))) + `(kite-log-debug ((,class (:inherit font-lock-comment-face)))) `(kite-log-error ((,class (:inherit error)))) `(kite-log-log ((,class (:inherit default)))) `(kite-log-warning ((,class (:inherit warning)))) @@ -1230,9 +1340,9 @@ `(kite-namespace-attribute-value-delimiter-face ((,class (:inherit kite-attribute-value-delimiter-face)))) `(kite-namespace-attribute-value-face ((,class (:inherit kite-attribute-value-face)))) `(kite-namespace-attribute-xmlns-face ((,class (:inherit kite-name-face)))) - `(kite-null ((,class (:inherit nxml-char-ref-number)))) - `(kite-number ((,class (:inherit nxml-char-ref-number)))) - `(kite-object ((,class (:inherit font-lock-variable-name)))) + `(kite-null ((,class (:inherit font-lock-constant-face)))) + `(kite-number ((,class (:inherit font-lock-constant-face)))) + `(kite-object ((,class (:inherit font-lock-variable-name-face)))) `(kite-processing-instruction-content-face ((,class (:inherit kite-delimited-data-face)))) `(kite-processing-instruction-delimiter-face ((,class (:inherit kite-delimiter-face)))) `(kite-processing-instruction-target-face ((,class (:inherit kite-name-face)))) @@ -1240,7 +1350,7 @@ `(kite-prolog-literal-content-face ((,class (:inherit kite-delimited-data-face)))) `(kite-prolog-literal-delimiter-face ((,class (:inherit kite-delimiter-face)))) `(kite-property-name ((,class (:inherit default)))) - `(kite-quote ((,class (:inherit font-lock-keyword)))) + `(kite-quote ((,class (:inherit font-lock-keyword-face)))) `(kite-stack-column-number ((,class (:inherit kite-number)))) `(kite-stack-error-message ((,class (:inherit default)))) `(kite-stack-error-type ((,class (:inherit error)))) @@ -1248,11 +1358,16 @@ `(kite-stack-function-name ((,class (:inherit font-lock-function-name-face)))) `(kite-stack-line-number ((,class (:inherit kite-number)))) `(kite-stack-pseudo-file-name ((,class (:inherit default)))) - `(kite-string ((,class (:inherit font-lock-string)))) + `(kite-string ((,class (:inherit font-lock-string-face)))) `(kite-table-head ((,class (:inherit highlight)))) `(kite-tag-delimiter-face ((,class (:inherit kite-delimiter-face)))) `(kite-tag-slash-face ((,class (:inherit kite-name-face)))) - `(kite-undefined ((,class (:inherit nxml-char-ref-number)))) + `(kite-undefined ((,class (:inherit font-lock-constant-face)))) +;;;;; langtool + `(langtool-errline ((,(append '((supports :underline (:style wave))) class) + (:underline (:style wave :color ,green) :inherit unspecified)) + (,class (:foreground ,red :weight bold :underline t)))) + `(langtool-correction-face ((,class (:inherit default :weight bold)))) ;;;;; ledger-mode `(ledger-font-payee-uncleared-face ((t (:foreground ,red)))) `(ledger-font-payee-cleared-face ((t (:foreground ,green :weight normal)))) @@ -1271,45 +1386,46 @@ `(ledger-font-reconciler-pending-face ((t (:foreground ,yellow :weight normal)))) `(ledger-font-report-clickable-face ((t (:foreground ,yellow :weight normal)))) ;;;;; linum-mode - `(linum ((,class (:foreground ,s-fringe-fg :background ,s-fringe-bg)))) + `(linum ((,class (:weight thin :underline nil :foreground ,s-fringe-fg :background ,s-fringe-bg)))) + `(linum-relative-current-face ((,class (:inherit linum)))) +;;;;; display-line-number-mode + `(line-number ((,class (:weight thin :underline nil :foreground ,s-fringe-fg :background ,s-fringe-bg)))) +;;;;; lsp-ui + `(lsp-ui-sideline-code-action ((,class (:foreground ,yellow :weight normal)))) ;;;;; lusty-explorer `(lusty-directory-face ((,class (:inherit dired-directory)))) `(lusty-file-face ((,class nil))) `(lusty-match-face ((,class (:inherit ido-first-match)))) `(lusty-slash-face ((,class (:foreground ,cyan :weight bold)))) +;;;;; macrostep + `(macrostep-expansion-highlight-face ((,class (:background ,base02)))) ;;;;; magit ;;;;;; headings and diffs `(magit-section-highlight ((t (:background ,base02)))) `(magit-section-heading ((t (:foreground ,yellow :weight bold)))) `(magit-section-heading-selection ((t (:foreground ,orange :weight bold)))) `(magit-diff-file-heading ((t (:weight bold)))) - `(magit-diff-file-heading-highlight ((t (:background ,base02 :weight bold)))) + `(magit-diff-file-heading-highlight ((t (:background ,base02)))) `(magit-diff-file-heading-selection ((t (:background ,base02 - :foreground ,orange :weight bold)))) + :foreground ,orange)))) `(magit-diff-hunk-heading ((t (:background ,(solarized-color-blend yellow base03 0.1))))) `(magit-diff-hunk-heading-highlight ((t (:background ,(solarized-color-blend yellow base02 0.1))))) `(magit-diff-hunk-heading-selection ((t (:background ,(solarized-color-blend yellow base02 0.1) - :foreground ,orange - :weight bold)))) + :foreground ,orange + :weight bold)))) `(magit-diff-lines-heading ((t (:background ,orange - :foreground ,base3)))) + :foreground ,base3)))) `(magit-diff-context-highlight ((t (:background ,base02)))) `(magit-diffstat-added ((t (:foreground ,green)))) `(magit-diffstat-removed ((t (:foreground ,red)))) -;;;;;; popup - `(magit-popup-heading ((t (:foreground ,base1 :weight normal)))) - `(magit-popup-key ((t (:foreground ,base1 :weight bold)))) - `(magit-popup-argument ((t (:foreground ,base1 :weight bold)))) - `(magit-popup-disabled-argument ((t (:foreground ,base01 :weight normal)))) - `(magit-popup-option-value ((t (:foreground ,base1 :weight bold)))) ;;;;;; process `(magit-process-ok ((t (:foreground ,green :weight bold)))) `(magit-process-ng ((t (:foreground ,red :weight bold)))) ;;;;;; log - `(magit-log-author ((t (:foreground ,base0)))) + `(magit-log-author ((t (:foreground ,base01 :weight bold)))) `(magit-log-date ((t (:foreground ,base01)))) `(magit-log-graph ((t (:foreground ,base1)))) ;;;;;; sequence @@ -1325,15 +1441,17 @@ `(magit-bisect-skip ((t (:foreground ,yellow)))) `(magit-bisect-bad ((t (:foreground ,red)))) ;;;;;; blame - `(magit-blame-heading ((t (:background ,base1 :foreground ,base02)))) - `(magit-blame-hash ((t (:background ,base1 :foreground ,base02)))) - `(magit-blame-name ((t (:background ,base1 :foreground ,orange-l)))) - `(magit-blame-date ((t (:background ,base1 :foreground ,orange-l)))) - `(magit-blame-summary ((t (:background ,base1 :foreground ,base02 :weight bold)))) + `(magit-blame-highlight ((t (:background ,base02)))) + `(magit-blame-heading ((t (:inherit magit-blame-highlight + :box (:color ,base02 :line-width 2))))) + `(magit-blame-summary ((t (:foreground ,base0)))) + `(magit-blame-hash ((t (:foreground ,violet)))) + `(magit-blame-name ((t (:foreground ,violet)))) + `(magit-blame-date ((t (:foreground ,violet)))) ;;;;;; references etc. `(magit-dimmed ((t (:foreground ,base01)))) `(magit-hash ((t (:foreground ,base01)))) - `(magit-tag ((t (:foreground ,cyan :weight bold)))) + `(magit-tag ((t (:foreground ,cyan :weight bold)))) `(magit-branch-remote ((t (:foreground ,green :weight bold)))) `(magit-branch-local ((t (:foreground ,blue :weight bold)))) `(magit-branch-current ((t (:foreground ,blue :weight bold :box t)))) @@ -1355,9 +1473,17 @@ `(magit-reflog-cherry-pick ((t (:foreground ,green)))) `(magit-reflog-remote ((t (:foreground ,cyan)))) `(magit-reflog-other ((t (:foreground ,cyan)))) +;;;;; magit-popup + `(magit-popup-heading ((t (:foreground ,yellow :weight bold)))) + `(magit-popup-key ((t (:foreground ,base1 :weight bold)))) + `(magit-popup-argument ((t (:foreground ,cyan :weight bold)))) + `(magit-popup-disabled-argument ((t (:foreground ,base01 :weight normal)))) + `(magit-popup-option-value ((t (:foreground ,cyan :weight bold)))) ;;;;; markdown-mode `(markdown-blockquote-face ((,class (:inherit font-lock-doc-face)))) `(markdown-bold-face ((,class (:inherit bold)))) + `(markdown-code-face ((,class (:inherit fixed-pitch :foreground ,base01 + :background unspecified)))) `(markdown-comment-face ((,class (:foreground ,base01 :strike-through t)))) `(markdown-footnote-face ((,class (:inherit default)))) `(markdown-header-delimiter-face ((,class (:foreground ,base01)))) @@ -1383,8 +1509,6 @@ `(markdown-pre-face ((,class (:foreground ,base01)))) `(markdown-reference-face ((,class (:inherit default :foreground ,base01)))) `(markdown-url-face ((,class (:foreground ,base01)))) -;;;;; multiple-cursors - `(mc/cursor-face ((,class (:inherit cursor :inverse-video nil)))) ;;;;; message-mode `(message-cited-text ((,class (:foreground ,base01)))) `(message-header-name ((,class (:foreground ,base01)))) @@ -1476,6 +1600,8 @@ `(mu4e-view-header-value-face ((,class (:foreground ,cyan :weight normal :slant normal)))) `(mu4e-view-link-face ((,class (:inherit link)))) `(mu4e-view-special-header-value-face ((,class (:foreground ,blue :weight normal :underline nil)))) +;;;;; multiple-cursors + `(mc/cursor-face ((,class (:inherit cursor :inverse-video nil)))) ;;;;; mumamo `(mumamo-background-chunk-submode1 ((,class (:background ,base02)))) ;;;;; nav @@ -1487,18 +1613,10 @@ `(nav-face-hfile ((,class (:foreground ,red)))) ;;;;; nav-flash ;; `(nav-flash-face ((,class (:background ,base02)))) - `(nav-flash-face ((,class (:foreground - ,(apply 'solarized-color-blend - (if - (eq variant 'light) - (list yellow base1 0.2) - (list cyan base1 0.1))) - :background - ,(apply 'solarized-color-blend - (if - (eq variant 'light) - (list yellow base03 0.2) - (list cyan base03 0.3))))))) + `(nav-flash-face ((,light-class (:foreground ,(solarized-color-blend yellow base1 0.2) + :background ,(solarized-color-blend yellow base03 0.2))) + (,dark-class (:foreground ,(solarized-color-blend cyan base1 0.1) + :background ,(solarized-color-blend cyan base03 0.3))))) ;;;;; navi2ch `(navi2ch-list-category-face ((,class (:foreground ,blue )))) `(navi2ch-list-add-board-name-face ((,class (:foreground ,yellow)))) @@ -1544,6 +1662,22 @@ `(neo-dir-link-face ((,class (:foreground ,blue)))) `(neo-file-link-face ((,class (:foreground ,base0)))) `(neo-expand-btn-face ((,class (:foreground ,base01)))) +;;;;; notmuch + `(notmuch-message-summary-face ((,class (:inherit highlight)))) + `(notmuch-search-date ((,class (:inherit default)))) + `(notmuch-search-count ((,class (:inherit default)))) + `(notmuch-search-subject ((,class (:inherit default)))) + `(notmuch-search-matching-authors ((,class (:inherit default)))) + `(notmuch-search-non-matching-authors ((,class (:inherit shadow)))) + `(notmuch-tag-face ((,class (:foreground ,yellow)))) + `(notmuch-tag-unread ((,class (:foreground ,magenta)))) + `(notmuch-search-flagged-face ((,class (:foreground ,blue)))) + `(notmuch-search-unread-face ((,class (:weight bold)))) + `(notmuch-tree-match-author-face ((,class (:foreground ,blue)))) + `(notmuch-tree-match-date-face ((,class (:foreground ,yellow)))) + `(notmuch-tree-match-tag-face ((,class (:foreground ,cyan)))) + `(notmuch-tree-no-match-face ((,class (:inherit font-lock-comment-face)))) + ;;;;; org-mode `(org-agenda-structure ((,class (:foreground ,base1 :background ,base02 @@ -1566,8 +1700,9 @@ :foreground ,blue :background ,base03)))) `(org-agenda-done ((,class (:foreground ,base01 :slant italic)))) `(org-archived ((,class (:foreground ,base01 :weight normal)))) - `(org-block ((,class (:foreground ,base01)))) - `(org-block-begin-line ((,class (:foreground ,base01 :slant italic)))) + `(org-block ((,class nil))) + `(org-block-begin-line ((,class (:inherit org-meta-line :underline t)))) + `(org-block-end-line ((,class (:inherit org-meta-line :overline t)))) `(org-checkbox ((,class (:background ,base03 :foreground ,base0 :box (:line-width 1 :style released-button))))) `(org-code ((,class (:foreground ,base01)))) @@ -1578,17 +1713,17 @@ `(org-headline-done ((,class (:foreground ,green)))) `(org-hide ((,class (:foreground ,base03)))) `(org-level-1 ((,class (:inherit ,s-variable-pitch :foreground ,orange - ,@(when solarized-scale-org-headlines - (list :height solarized-height-plus-4)))))) + ,@(when solarized-scale-org-headlines + (list :height solarized-height-plus-4)))))) `(org-level-2 ((,class (:inherit ,s-variable-pitch :foreground ,green - ,@(when solarized-scale-org-headlines - (list :height solarized-height-plus-3)))))) + ,@(when solarized-scale-org-headlines + (list :height solarized-height-plus-3)))))) `(org-level-3 ((,class (:inherit ,s-variable-pitch :foreground ,blue - ,@(when solarized-scale-org-headlines - (list :height solarized-height-plus-2)))))) + ,@(when solarized-scale-org-headlines + (list :height solarized-height-plus-2)))))) `(org-level-4 ((,class (:inherit ,s-variable-pitch :foreground ,yellow - ,@(when solarized-scale-org-headlines - (list :height solarized-height-plus-1)))))) + ,@(when solarized-scale-org-headlines + (list :height solarized-height-plus-1)))))) `(org-level-5 ((,class (:inherit ,s-variable-pitch :foreground ,cyan)))) `(org-level-6 ((,class (:inherit ,s-variable-pitch @@ -1598,6 +1733,8 @@ `(org-level-8 ((,class (:inherit ,s-variable-pitch :foreground ,blue)))) `(org-link ((,class (:foreground ,yellow :underline t)))) + `(org-meta-line ((,class (:foreground ,base01 :slant italic)))) + `(org-macro ((,class (:foreground ,s-base1)))) `(org-sexp-date ((,class (:foreground ,violet)))) `(org-scheduled ((,class (:foreground ,green)))) `(org-scheduled-previously ((,class (:foreground ,cyan)))) @@ -1622,7 +1759,7 @@ ;; latest additions `(org-agenda-dimmed-todo-face ((,class (:foreground ,base01)))) `(org-agenda-restriction-lock ((,class (:background ,yellow)))) - `(org-clock-overlay ((,class (:background ,yellow)))) + `(org-clock-overlay ((,class (:background ,base02)))) `(org-column ((,class (:background ,base02 :strike-through nil :underline nil :slant normal :weight normal :inherit default)))) `(org-column-title ((,class (:background ,base02 :underline t :weight bold)))) @@ -1634,25 +1771,35 @@ `(org-latex-and-export-specials ((,class (:foreground ,orange)))) `(org-mode-line-clock-overrun ((,class (:inherit mode-line :background ,red)))) ;;;;; outline - `(outline-1 ((,class (:inherit org-level-1 :height ,solarized-height-plus-4)))) - `(outline-2 ((,class (:inherit org-level-2 :height ,solarized-height-plus-3)))) - `(outline-3 ((,class (:inherit org-level-3 :height ,solarized-height-plus-2)))) - `(outline-4 ((,class (:inherit org-level-4 :height ,solarized-height-plus-1)))) - `(outline-5 ((,class (:inherit org-level-5)))) - `(outline-6 ((,class (:inherit org-level-6)))) - `(outline-7 ((,class (:inherit org-level-7)))) - `(outline-8 ((,class (:inherit org-level-8)))) + `(outline-1 ((,class (:inherit ,s-variable-pitch :foreground ,orange + ,@(and solarized-scale-outline-headlines + (list :height solarized-height-plus-4)))))) + `(outline-2 ((,class (:inherit ,s-variable-pitch :foreground ,green + ,@(and solarized-scale-outline-headlines + (list :height solarized-height-plus-3)))))) + `(outline-3 ((,class (:inherit ,s-variable-pitch :foreground ,blue + ,@(and solarized-scale-outline-headlines + (list :height solarized-height-plus-2)))))) + `(outline-4 ((,class (:inherit ,s-variable-pitch :foreground ,yellow + ,@(when solarized-scale-outline-headlines + (list :height solarized-height-plus-1)))))) + `(outline-5 ((,class (:inherit ,s-variable-pitch :foreground ,cyan)))) + `(outline-6 ((,class (:inherit ,s-variable-pitch :foreground ,green)))) + `(outline-7 ((,class (:inherit ,s-variable-pitch :foreground ,red)))) + `(outline-8 ((,class (:inherit ,s-variable-pitch :foreground ,blue)))) +;;;;; outline-minor-faces + `(outline-minor-0 ((,class (:weight bold :background ,s-base2)))) + `(outline-minor-1 + ((,class (:inherit (outline-minor-0 outline-1) + :background ,(solarized-color-blend s-base3 yellow .9))))) ;;;;; paren-face `(paren-face ((,class (:foreground ,base01)))) ;;;;; perspective `(persp-selected-face ((,class (:foreground ,yellow)))) -;;;;; pretty-mode - `(pretty-mode-symbol-face ((,class (:foreground ,yellow :weight normal)))) -;;;;; prodigy - `(prodigy-green-face ((,class (:foreground ,green)))) - `(prodigy-red-face ((,class (:foreground ,orange)))) - `(prodigy-yellow-face ((,class (:foreground ,yellow)))) - `(prodigy-line-face ((,class (:background ,base02)))) +;;;;; pophint + `(pophint:tip-face ((,class (:background ,magenta :foreground ,base03)))) + `(pophint:match-face ((,class (:background ,blue :foreground ,base03)))) + `(pophint:pos-tip-face ((,class (:background ,base02 :foreground ,base0)))) ;;;;; popup `(popup-face ((,class (:background ,base02 :foreground ,base0)))) `(popup-isearch-match ((,class (:background ,yellow :foreground ,base03)))) @@ -1662,23 +1809,26 @@ `(popup-scroll-bar-background-face ((,class (:background ,base01)))) `(popup-scroll-bar-foreground-face ((,class (:background ,base1)))) `(popup-tip-face ((,class (:background ,base02 :foreground ,base0)))) -;;;;; pophint - `(pophint:tip-face ((,class (:background ,magenta :foreground ,base03)))) - `(pophint:match-face ((,class (:background ,blue :foreground ,base03)))) - `(pophint:pos-tip-face ((,class (:background ,base02 :foreground ,base0)))) ;;;;; powerline `(powerline-active1 ((,class ,(if solarized-high-contrast-mode-line `(:background ,base00 :foreground ,base03) - `(:background ,base03 :foreground ,base00))))) + `(:background ,base03 :foreground ,base00))))) `(powerline-active2 ((,class ,(if solarized-high-contrast-mode-line `(:background ,base01 :foreground ,base03) - `(:background ,base02 :foreground ,base00))))) + `(:background ,base02 :foreground ,base00))))) `(powerline-inactive1 ((,class ,(if solarized-high-contrast-mode-line `(:background ,base03 :foreground ,base1) - `(:background ,base02 :foreground ,base01))))) + `(:background ,base02 :foreground ,base01))))) `(powerline-inactive2 ((,class ,(if solarized-high-contrast-mode-line `(:background ,base02 :foreground ,base1) - `(:background ,base03 :foreground ,base01))))) + `(:background ,base03 :foreground ,base01))))) +;;;;; pretty-mode + `(pretty-mode-symbol-face ((,class (:foreground ,yellow :weight normal)))) +;;;;; prodigy + `(prodigy-green-face ((,class (:foreground ,green)))) + `(prodigy-red-face ((,class (:foreground ,orange)))) + `(prodigy-yellow-face ((,class (:foreground ,yellow)))) + `(prodigy-line-face ((,class (:background ,base02)))) ;;;;; rainbow-blocks `(rainbow-blocks-depth-1-face ((,class (:foreground ,cyan)))) `(rainbow-blocks-depth-2-face ((,class (:foreground ,yellow)))) @@ -1705,13 +1855,6 @@ `(rainbow-delimiters-depth-12-face ((,class (:foreground ,violet)))) `(rainbow-delimiters-unmatched-face ((,class (:foreground ,base0 :background ,base03 :inverse-video t)))) -;;;;; rst-mode - `(rst-level-1-face ((,class (:background ,yellow :foreground ,base03)))) - `(rst-level-2-face ((,class (:background ,cyan :foreground ,base03)))) - `(rst-level-3-face ((,class (:background ,blue :foreground ,base03)))) - `(rst-level-4-face ((,class (:background ,violet :foreground ,base03)))) - `(rst-level-5-face ((,class (:background ,magenta :foreground ,base03)))) - `(rst-level-6-face ((,class (:background ,red :foreground ,base03)))) ;;;;; rpm-mode `(rpm-spec-dir-face ((,class (:foreground ,green)))) `(rpm-spec-doc-face ((,class (:foreground ,green)))) @@ -1722,13 +1865,29 @@ `(rpm-spec-section-face ((,class (:foreground ,yellow)))) `(rpm-spec-tag-face ((,class (:foreground ,blue)))) `(rpm-spec-var-face ((,class (:foreground ,red)))) +;;;;; rst-mode + `(rst-level-1 ((,class (:inherit org-level-1)))) + `(rst-level-2 ((,class (:inherit org-level-2)))) + `(rst-level-3 ((,class (:inherit org-level-3)))) + `(rst-level-4 ((,class (:inherit org-level-4)))) + `(rst-level-5 ((,class (:inherit org-level-5)))) + `(rst-level-6 ((,class (:inherit org-level-6)))) ;;;;; sh-mode `(sh-quoted-exec ((,class (:foreground ,violet :weight bold)))) `(sh-escaped-newline ((,class (:foreground ,yellow :weight bold)))) `(sh-heredoc ((,class (:foreground ,yellow :weight bold)))) +;;;;; show-paren + `(show-paren-match + ((,class (:foreground ,magenta :background unspecified + :weight ,s-maybe-bold)))) + `(show-paren-mismatch + ((,class (:foreground ,base02 :background ,red + :weight ,s-maybe-bold)))) ;;;;; skewer-mode `(skewer-error-face ((,class (:foreground ,orange :underline nil)))) `(skewer-repl-log-face ((,class (:foreground ,violet)))) +;;;;; slime + `(slime-repl-inputed-output-face ((,class (:foreground ,red)))) ;;;;; smart-mode-line ;; use (setq sml/theme nil) to enable Solarized for sml `(sml/filename ((,class (:foreground ,base1 :weight bold)))) @@ -1742,6 +1901,14 @@ `(sml/vc-edited ((,class (:foreground ,green)))) `(sml/charging ((,class (:foreground ,base1)))) `(sml/discharging ((,class (:foreground ,base1 :weight bold)))) +;;;;; solaire + `(solaire-default-face ((,class (:inherit default :background ,(solarized-color-blend base02 base03 0.5))))) + `(solaire-minibuffer-face ((,class (:inherit default :background ,(solarized-color-blend base02 base03 0.5))))) + `(solaire-line-number-face ((,class (:inherit (line-number solaire-default-face) :background ,(solarized-color-blend base02 base03 0.5))))) + `(solaire-hl-line-face ((,class (:inherit hl-line :background ,(solarized-color-blend base02 base03 0.95))))) + `(solaire-org-hide-face ((,class (:inherit org-hide :background ,(solarized-color-blend base02 base03 0.5))))) + `(solaire-mode-line-face ((,class (:inherit default :background ,s-mode-line-bg)))) + `(solaire-mode-line-inactive-face ((,class (:inherit default :background ,s-mode-line-inactive-bg)))) ;;;;; smartparens `(sp-pair-overlay-face ((,class (:background ,base02)))) `(sp-wrap-overlay-face ((,class (:background ,base02)))) @@ -1753,14 +1920,42 @@ `(sp-show-pair-mismatch-face ((,class (:foreground ,base02 :background ,red :weight ,s-maybe-bold)))) -;;;;; show-paren - `(show-paren-match - ((,class (:foreground ,magenta :background unspecified - :weight ,s-maybe-bold)))) - `(show-paren-mismatch - ((,class (:foreground ,base02 :background ,red - :weight ,s-maybe-bold)))) - +;;;;; spaceline + `(spaceline-highlight-face ((,class (:foreground ,base1 :background ,yellow-lc)))) + `(spaceline-flycheck-error ((,class (:foreground ,red)))) + `(spaceline-flycheck-warning ((,class (:foreground ,yellow)))) + `(spaceline-flycheck-info ((,class (:foreground ,cyan)))) +;;;;; speedbar + `(speedbar-button-face ((,class (:inherit ,s-variable-pitch + :foreground ,base01)))) + `(speedbar-directory-face ((,class (:inherit ,s-variable-pitch :foreground ,blue)))) + `(speedbar-file-face ((,class (:inherit ,s-variable-pitch :foreground ,base0)))) + `(speedbar-highlight-face ((,class (:inherit ,s-variable-pitch :background ,base02)))) + `(speedbar-selected-face ((,class (:inherit ,s-variable-pitch + :foreground ,yellow :underline t)))) + `(speedbar-separator-face ((,class (:inherit ,s-variable-pitch + :background ,blue :foreground ,base03 + :overline ,cyan-lc)))) + `(speedbar-tag-face ((,class (:inherit ,s-variable-pitch :foreground ,green)))) +;;;;; stripe-buffer + `(stripe-highlight ((,class (:background ,base02)))) +;;;;; structured-haskell + `(shm-current-face ((,class (:background ,base02)))) + `(shm-quarantine-face ((,class (:background ,base01)))) +;;;;; swiper + `(swiper-line-face ((,class (:background ,base02)))) + `(swiper-match-face-1 ((,class (:weight bold :foreground ,base1)))) + `(swiper-match-face-2 ((,class (:weight bold :foreground ,yellow)))) + `(swiper-match-face-3 ((,class (:weight bold :foreground ,yellow)))) + `(swiper-match-face-4 ((,class (:weight bold :foreground ,yellow)))) +;;;;; swoop + `(swoop-face-header-format-line ((,class (:foreground ,yellow :weight bold + :height unspecified)))) + `(swoop-face-line-buffer-name ((,class (:background ,base02 :foreground ,base1 + :weight bold :height unspecified)))) + `(swoop-face-line-number ((,class (:foreground ,base01)))) + `(swoop-face-target-line ((,class (:background ,base02 :foreground unspecified)))) + `(swoop-face-target-words ((,class (:background unspecified :foreground ,magenta)))) ;;;;; sx (WIP) `(sx-custom-button ((,class (:background ,base02 :foreground ,base1 :box (:line-width 2 :style released-button :height 0.9))))) @@ -1819,26 +2014,6 @@ `(syslog-su ((,class (:background unspecified :foreground ,violet :weight normal)))) -;;;;; slime - `(slime-repl-inputed-output-face ((,class (:foreground ,red)))) -;;;;; speedbar - `(speedbar-button-face ((,class (:inherit ,s-variable-pitch - :foreground ,base01)))) - `(speedbar-directory-face ((,class (:inherit ,s-variable-pitch :foreground ,blue)))) - `(speedbar-file-face ((,class (:inherit ,s-variable-pitch :foreground ,base0)))) - `(speedbar-highlight-face ((,class (:inherit ,s-variable-pitch :background ,base02)))) - `(speedbar-selected-face ((,class (:inherit ,s-variable-pitch - :foreground ,yellow :underline t)))) - `(speedbar-separator-face ((,class (:inherit ,s-variable-pitch - :background ,blue :foreground ,base03 - :overline ,cyan-lc)))) - `(speedbar-tag-face ((,class (:inherit ,s-variable-pitch :foreground ,green)))) -;;;;; stripe-buffer - `(stripe-highlight ((,class (:background ,base02)))) -;;;;; structured-haskell - `(shm-current-face ((,class (:background ,base02)))) - `(shm-quarantine-face ((,class (:background ,base01)))) -;;;;; sunrise commander ;;;;;; headings `(sr-active-path-face ((,class (:background ,blue :foreground ,base03 :height ,solarized-height-plus-1 :weight bold)))) @@ -1871,14 +2046,17 @@ ;;;;;; misc `(sr-clex-hotchar-face ((,class (:background ,red :foreground ,base03 :weight bold)))) -;;;;; swoop - `(swoop-face-header-format-line ((,class (:foreground ,yellow :weight bold - :height unspecified)))) - `(swoop-face-line-buffer-name ((,class (:background ,base02 :foreground ,base1 - :weight bold :height unspecified)))) - `(swoop-face-line-number ((,class (:foreground ,base01)))) - `(swoop-face-target-line ((,class (:background ,base02 :foreground unspecified)))) - `(swoop-face-target-words ((,class (:background unspecified :foreground ,magenta)))) +;;;;; tabbar + `(tabbar-default ((,class (:foreground ,base03 :background ,base03)))) + `(tabbar-highlight ((,class (:underline t)))) + `(tabbar-button ((,class (:foreground ,base3 :background ,base03)))) + `(tabbar-button-highlight ((,class (:inherit 'tabbar-button :inverse-video t)))) + `(tabbar-modified ((,class (:inherit tabbar-button :foreground ,blue :weight light :slant italic)))) + `(tabbar-unselected ((,class (:inherit tabbar-default :background ,base02 :slant italic :underline nil :box (:line-width 1 :color ,base03))))) + `(tabbar-unselected-modified ((,class (:inherit tabbar-modified :background ,base02 :underline nil :box (:line-width 1 :color ,base03))))) + `(tabbar-selected ((,class (:inherit tabbar-default :foreground ,base3 :background ,base03 :weight bold :underline nil :box (:line-width 1 :color ,base03))))) + `(tabbar-selected-modified ((,class (:inherit tabbar-selected :foreground ,blue :underline nil :box (:line-width 1 :color ,base03))))) + ;;;;; table `(table-cell ((,class (:foreground ,base0 :background ,base02)))) ;;;;; term @@ -1900,6 +2078,25 @@ ;; zencoding uses this. `(tooltip ((,class (:background ,yellow-lc :foreground ,yellow-hc :inherit ,s-variable-pitch)))) +;;;;; transient + `(transient-heading ((t (:foreground ,yellow :weight bold)))) + `(transient-key ((t (:foreground ,base1 :weight bold)))) + `(transient-argument ((t (:foreground ,cyan :weight bold)))) + `(transient-value ((t (:foreground ,cyan :weight bold)))) + `(transient-inactive-argument ((t (:foreground ,base01 :weight normal)))) + `(transient-inactive-value ((t (:foreground ,base01 :weight normal)))) + `(transient-unreachable ((t (:foreground ,base01 :weight normal)))) + `(transient-unreachable-key ((t (:foreground ,base01 :weight normal)))) + `(transient-enabled-suffix ((t (:foreground ,s-base3 + :background ,green + :weight bold)))) + `(transient-disabled-suffix ((t (:foreground ,s-base3 + :background ,red + :weight bold)))) + `(transient-nonstandard-key + ((t (:underline nil :background ,(solarized-color-blend yellow-l s-base3 0.2))))) + `(transient-mismatched-key + ((t (:underline nil :background ,(solarized-color-blend red-l s-base3 0.2))))) ;;;;; tuareg `(tuareg-font-lock-governing-face ((,class (:foreground ,magenta :weight bold)))) `(tuareg-font-lock-multistage-face ((,class (:foreground ,blue :background ,base02 @@ -1946,6 +2143,33 @@ `(w3m-tab-unselected-retrieving ((,class (:background ,base02 :foreground ,orange)))) `(w3m-tab-unselected-unseen ((,class (:background ,base02 :foreground ,violet)))) +;;;;; wanderlust + `(wl-highlight-folder-few-face ((,class (:foreground ,red)))) + `(wl-highlight-folder-many-face ((,class (:foreground ,red)))) + `(wl-highlight-folder-path-face ((,class (:foreground ,orange)))) + `(wl-highlight-folder-unread-face ((,class (:foreground ,blue)))) + `(wl-highlight-folder-zero-face ((,class (:foreground ,base0)))) + `(wl-highlight-folder-unknown-face ((,class (:foreground ,blue)))) + `(wl-highlight-message-citation-header ((,class (:foreground ,red)))) + `(wl-highlight-message-cited-text-1 ((,class (:foreground ,red)))) + `(wl-highlight-message-cited-text-2 ((,class (:foreground ,green)))) + `(wl-highlight-message-cited-text-3 ((,class (:foreground ,blue)))) + `(wl-highlight-message-cited-text-4 ((,class (:foreground ,blue)))) + `(wl-highlight-message-header-contents-face ((,class (:foreground ,green)))) + `(wl-highlight-message-headers-face ((,class (:foreground ,red)))) + `(wl-highlight-message-important-header-contents ((,class (:foreground ,green)))) + `(wl-highlight-message-header-contents ((,class (:foreground ,green)))) + `(wl-highlight-message-important-header-contents2 ((,class (:foreground ,green)))) + `(wl-highlight-message-signature ((,class (:foreground ,green)))) + `(wl-highlight-message-unimportant-header-contents ((,class (:foreground ,base0)))) + `(wl-highlight-summary-answered-face ((,class (:foreground ,blue)))) + `(wl-highlight-summary-disposed-face ((,class (:foreground ,base0 :slant italic)))) + `(wl-highlight-summary-new-face ((,class (:foreground ,blue)))) + `(wl-highlight-summary-normal-face ((,class (:foreground ,base0)))) + `(wl-highlight-summary-thread-top-face ((,class (:foreground ,yellow)))) + `(wl-highlight-thread-indent-face ((,class (:foreground ,magenta)))) + `(wl-highlight-summary-refiled-face ((,class (:foreground ,base0)))) + `(wl-highlight-summary-displaying-face ((,class (:underline t :weight bold)))) ;;;;; web-mode `(web-mode-builtin-face ((,class (:inherit font-lock-builtin-face)))) `(web-mode-comment-face ((,class (:foreground ,base01)))) @@ -2009,19 +2233,27 @@ `(weather-metno-entry ((,class (:foreground ,cyan)))) `(weather-metno-footer ((,class (:inherit font-lock-comment-face)))) `(weather-metno-header ((,class (:inherit header-line)))) +;;;;; weechat + `(weechat-error-face ((,class (:inherit error)))) + `(weechat-highlight-face ((,class (:foreground ,base0 :weight bold)))) + `(weechat-nick-self-face ((,class (:foreground ,base01 :weight unspecified)))) + `(weechat-prompt-face ((,class (:inherit minibuffer-prompt)))) + `(weechat-time-face ((,class (:foreground ,base01)))) ;;;;; wgrep `(wgrep-delete-face ((,class (:background unspecified :foreground ,blue)))) `(wgrep-done-face ((,class (:foreground ,green)))) `(wgrep-face ((,class (:background unspecified :foreground ,blue)))) `(wgrep-file-face ((,class (:background unspecified :foreground ,magenta)))) `(wgrep-reject-face ((,class (:foreground ,red :weight unspecified)))) +;;;;; which-func-mode + `(which-func ((,class (:foreground ,green)))) ;;;;; whitespace-mode `(whitespace-space ((,class (:background unspecified :foreground ,base01 :inverse-video unspecified :slant italic)))) `(whitespace-hspace ((,class (:background unspecified :foreground ,base1 :inverse-video unspecified)))) `(whitespace-tab ((,class (:background unspecified :foreground ,red - :inverse-video unspecified :weight bold)))) + :inverse-video t)))) `(whitespace-newline ((,class(:background unspecified :foreground ,base01 :inverse-video unspecified)))) `(whitespace-trailing ((,class (:background unspecified :foreground ,orange-lc @@ -2036,41 +2268,6 @@ :inverse-video t)))) `(whitespace-space-after-tab ((,class (:background unspecified :foreground ,orange :inverse-video t :weight bold)))) -;;;;; wanderlust - `(wl-highlight-folder-few-face ((,class (:foreground ,red)))) - `(wl-highlight-folder-many-face ((,class (:foreground ,red)))) - `(wl-highlight-folder-path-face ((,class (:foreground ,orange)))) - `(wl-highlight-folder-unread-face ((,class (:foreground ,blue)))) - `(wl-highlight-folder-zero-face ((,class (:foreground ,base0)))) - `(wl-highlight-folder-unknown-face ((,class (:foreground ,blue)))) - `(wl-highlight-message-citation-header ((,class (:foreground ,red)))) - `(wl-highlight-message-cited-text-1 ((,class (:foreground ,red)))) - `(wl-highlight-message-cited-text-2 ((,class (:foreground ,green)))) - `(wl-highlight-message-cited-text-3 ((,class (:foreground ,blue)))) - `(wl-highlight-message-cited-text-4 ((,class (:foreground ,blue)))) - `(wl-highlight-message-header-contents-face ((,class (:foreground ,green)))) - `(wl-highlight-message-headers-face ((,class (:foreground ,red)))) - `(wl-highlight-message-important-header-contents ((,class (:foreground ,green)))) - `(wl-highlight-message-header-contents ((,class (:foreground ,green)))) - `(wl-highlight-message-important-header-contents2 ((,class (:foreground ,green)))) - `(wl-highlight-message-signature ((,class (:foreground ,green)))) - `(wl-highlight-message-unimportant-header-contents ((,class (:foreground ,base0)))) - `(wl-highlight-summary-answered-face ((,class (:foreground ,blue)))) - `(wl-highlight-summary-disposed-face ((,class (:foreground ,base0 :slant italic)))) - `(wl-highlight-summary-new-face ((,class (:foreground ,blue)))) - `(wl-highlight-summary-normal-face ((,class (:foreground ,base0)))) - `(wl-highlight-summary-thread-top-face ((,class (:foreground ,yellow)))) - `(wl-highlight-thread-indent-face ((,class (:foreground ,magenta)))) - `(wl-highlight-summary-refiled-face ((,class (:foreground ,base0)))) - `(wl-highlight-summary-displaying-face ((,class (:underline t :weight bold)))) -;;;;; weechat - `(weechat-error-face ((,class (:inherit error)))) - `(weechat-highlight-face ((,class (:foreground ,base0 :weight bold)))) - `(weechat-nick-self-face ((,class (:foreground ,base01 :weight unspecified)))) - `(weechat-prompt-face ((,class (:inherit minibuffer-prompt)))) - `(weechat-time-face ((,class (:foreground ,base01)))) -;;;;; which-func-mode - `(which-func ((,class (:foreground ,green)))) ;;;;; window-number-mode `(window-number-face ((,class (:foreground ,green)))) ;;;;; yascroll @@ -2111,8 +2308,14 @@ `(fci-rule-color ,base02) ;;;;; magit `(magit-diff-use-overlays nil) +;;;;; nrepl-client + `(nrepl-message-colors + '(,red ,orange ,yellow ,green-d ,green-l + ,blue-d ,cyan ,magenta ,violet)) ;;;;; highlight-changes `(highlight-changes-colors '(,magenta ,violet)) +;;;;; highlight-parentheses + `(hl-paren-colors '(,cyan ,yellow ,blue ,violet ,green)) ;;;;; highlight-symbol `(highlight-symbol-foreground-color ,base1) `(highlight-symbol-colors @@ -2136,6 +2339,7 @@ `(term-default-fg-color ,base0) ;; @deprecated24.3 `(term-default-bg-color ,base03) ;; @deprecated24.3 ;;;;; vc + `(vc-annotate-background-mode nil) `(vc-annotate-color-map '((20 . ,red) (40 . ,(solarized-color-blend yellow red (/ 2.0 4))) @@ -2166,16 +2370,16 @@ ,blue-d ,blue ,magenta-d ,magenta ,cyan-d ,cyan - ,base0 ,base00))) + ,base0 ,base00)) ;;;;; xterm-color `(xterm-color-names [,base02 ,red ,green ,yellow ,blue ,magenta ,cyan ,base2]) `(xterm-color-names-bright [,base03 ,orange ,base01 ,base00 - ,base0 ,violet ,base1 ,base3]) + ,base0 ,violet ,base1 ,base3])) ;;; Setup End - (when childtheme - (funcall childtheme)) - ) ; END custom-theme-set-variables + (when childtheme + (funcall childtheme)) + ) ; END custom-theme-set-variables ) ; END defun create-solarized-theme ;;; Footer diff -Nru solarized-emacs-1.2.2/solarized-light-theme.el solarized-emacs-1.3.0/solarized-light-theme.el --- solarized-emacs-1.2.2/solarized-light-theme.el 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/solarized-light-theme.el 2019-06-06 11:20:58.000000000 -0400 @@ -1,3 +1,26 @@ +;;; solarized-light-theme.el --- Solarized Light Theme for Emacs. + +;; Copyright (C) 2011-2019 Bozhidar Batsov + +;; 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 <http://www.gnu.org/licenses/>. + +;;; Commentary: +;; +;; The light variant of the solarized theme. +;; +;;; Code: + (require 'solarized) (deftheme solarized-light "The light variant of the Solarized colour theme") @@ -5,3 +28,6 @@ (create-solarized-theme 'light 'solarized-light) (provide-theme 'solarized-light) + +(provide 'solarized-light-theme) +;;; solarized-light-theme.el ends here diff -Nru solarized-emacs-1.2.2/solarized-theme-pkg.el solarized-emacs-1.3.0/solarized-theme-pkg.el --- solarized-emacs-1.2.2/solarized-theme-pkg.el 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/solarized-theme-pkg.el 2019-06-06 11:20:58.000000000 -0400 @@ -2,4 +2,4 @@ "solarized-theme" "1.2.2" "The Solarized color theme, ported to Emacs." - '((dash "2.6.0"))) + '((emacs "24.1") (cl-lib "0.5") (dash "2.6.0"))) diff -Nru solarized-emacs-1.2.2/solarized-theme-utils.el solarized-emacs-1.3.0/solarized-theme-utils.el --- solarized-emacs-1.2.2/solarized-theme-utils.el 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/solarized-theme-utils.el 2019-06-06 11:20:58.000000000 -0400 @@ -24,7 +24,7 @@ ;; ;;;; Code: -(require 'cl) +(require 'cl-lib) (require 'solarized) (defun solarized-import-faces (&optional regexp already-defined) @@ -54,10 +54,10 @@ (setq result (nconc (list attribute (cond - ((member* attribute - '(":background" - ":foreground") - :test 'string=) + ((cl-member attribute + '(":background" + ":foreground") + :test 'string=) (format "\"%s\"" value)) (t value))) result)))))) (if (get face 'theme-face) diff -Nru solarized-emacs-1.2.2/tests/emacs-visual-test.el solarized-emacs-1.3.0/tests/emacs-visual-test.el --- solarized-emacs-1.2.2/tests/emacs-visual-test.el 2015-07-06 13:28:07.000000000 -0400 +++ solarized-emacs-1.3.0/tests/emacs-visual-test.el 2019-06-06 11:20:58.000000000 -0400 @@ -1,27 +1,22 @@ ;;; emacs-visual-test.el --- -;;; Commentary: -;; - (load-file "init.el") -(require 's) (require 'dash) -(require 'f) (setq header-line-format "header line content") (defconst screenshots-directory - (f-expand "screenshots" tests-directory)) + (expand-file-name "screenshots" tests-directory)) (defconst test-files-directory - (f-expand "test-files" tests-directory)) + (expand-file-name "test-files" tests-directory)) (defun visual-test-find-file ( name) - (find-file (f-expand name test-files-directory))) + (find-file (expand-file-name name test-files-directory))) (defun visual-test-screenshot () (call-process "scrot" nil nil nil "-u" - (f-expand "screenshot-%Y-%m-%d_%H-%M-%S_$wx$h.png" - screenshots-directory)) + (expand-file-name "screenshot-%Y-%m-%d_%H-%M-%S_$wx$h.png" + screenshots-directory)) (message "saved screenshot")) ;; (setq solarized-high-contrast-mode-line t) @@ -35,7 +30,6 @@ (goto-char 27) (call-interactively 'ispell-complete-word) - (run-with-idle-timer 2 nil '(lambda () (visual-test-screenshot) @@ -44,8 +38,6 @@ ;; (kill-emacs) )) - - (provide 'emacs-visual-test) ;;; emacs-visual-test.el ends here
signature.asc
Description: PGP signature
