thirdparty/color-theme-solarized/solarized-definitions.el
author Luke Hoersten <Luke@Hoersten.org>
Sat, 22 Jun 2013 22:54:53 -0500
changeset 54 e1b82f67f96e
parent 49 942fe8d1a653
permissions -rw-r--r--
Cleaned up unused modes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     1
(eval-when-compile
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     2
  (require 'cl))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     3
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     4
(defconst solarized-description
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     5
  "Color theme by Ethan Schoonover, created 2011-03-24.
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     6
Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized.")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     7
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     8
(defcustom solarized-degrade nil
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
     9
  "For test purposes only; when in GUI mode, forces Solarized to use the 256
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    10
degraded color mode to test the approximate color values for accuracy."
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    11
  :type 'boolean
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    12
  :group 'solarized)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    13
49
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    14
(defcustom solarized-diff-mode 'normal
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    15
  "Sets the level of highlighting to use in diff-like modes."
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    16
  :type 'symbol
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    17
  :options '(high normal low)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    18
  :group 'solarized)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    19
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    20
(defcustom solarized-bold t
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    21
  "Stops Solarized from displaying bold when nil."
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    22
  :type 'boolean
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    23
  :group 'solarized)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    24
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    25
(defcustom solarized-underline t
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    26
  "Stops Solarized from displaying underlines when nil."
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    27
  :type 'boolean
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    28
  :group 'solarized)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    29
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    30
(defcustom solarized-italic t
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    31
  "Stops Solarized from displaying italics when nil."
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    32
  :type 'boolean
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    33
  :group 'solarized)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    34
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    35
(defcustom solarized-termcolors 16
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    36
  "This setting applies to emacs in terminal (non-GUI) mode.
48
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    37
If set to 16, emacs will use the terminal emulator's colorscheme (best option
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    38
as long as you've set your emulator's colors to the Solarized palette). If
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    39
set to 256 and your terminal is capable of displaying 256 colors, emacs will
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    40
use the 256 degraded color mode."
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    41
  :type 'integer
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    42
  :options '(16 256)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    43
  :group 'solarized)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    44
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    45
(defcustom solarized-contrast 'normal
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    46
  "Stick with normal! It's been carefully tested. Setting this option to high or
48
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    47
low does use the same Solarized palette but simply shifts some values up or
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    48
down in order to expand or compress the tonal range displayed."
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    49
  :type 'symbol
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    50
  :options '(high normal low)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    51
  :group 'solarized)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    52
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    53
(defcustom solarized-broken-srgb (if (eq system-type 'darwin) t nil)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    54
  "Emacs bug #8402 results in incorrect color handling on Macs. If this is t
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    55
(the default on Macs), Solarized works around it with alternative colors.
48
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    56
However, these colors are not totally portable, so you may be able to edit
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    57
the \"Gen RGB\" column in solarized-definitions.el to improve them further."
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    58
  :type 'boolean
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    59
  :group 'solarized)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    60
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    61
;; FIXME: The Generic RGB colors will actually vary from device to device, but
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    62
;;        hopefully these are closer to the intended colors than the sRGB values
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    63
;;        that Emacs seems to dislike
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    64
(defvar solarized-colors
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    65
  ;; name    sRGB      Gen RGB   degraded  ANSI(Solarized terminal)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    66
  '((base03  "#002b36" "#042028" "#1c1c1c" "#7f7f7f")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    67
    (base02  "#073642" "#0a2832" "#262626" "#000000")
48
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    68
    (base01  "#586e75" "#465a61" "#585858" "#00ff00")
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    69
    (base00  "#657b83" "#52676f" "#626262" "#ffff00")
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    70
    (base0   "#839496" "#708183" "#808080" "#5c5cff")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    71
    (base1   "#93a1a1" "#81908f" "#8a8a8a" "#00ffff")
48
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    72
    (base2   "#eee8d5" "#e9e2cb" "#e4e4e4" "#e5e5e5")
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    73
    (base3   "#fdf6e3" "#fcf4dc" "#ffffd7" "#ffffff")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    74
    (yellow  "#b58900" "#a57705" "#af8700" "#cdcd00")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    75
    (orange  "#cb4b16" "#bd3612" "#d75f00" "#ff0000")
48
f17ebf233431 More updates to solarized.
Luke Hoersten <Luke@Hoersten.org>
parents: 47
diff changeset
    76
    (red     "#dc322f" "#c60007" "#d70000" "#cd0000")
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    77
    (magenta "#d33682" "#c61b6e" "#af005f" "#cd00cd")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    78
    (violet  "#6c71c4" "#5859b7" "#5f5faf" "#ff00ff")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    79
    (blue    "#268bd2" "#2075c7" "#0087ff" "#0000ee")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    80
    (cyan    "#2aa198" "#259185" "#00afaf" "#00cdcd")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    81
    (green   "#859900" "#728a05" "#5f8700" "#00cd00"))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    82
  "This is a table of all the colors used by the Solarized color theme. Each
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    83
   column is a different set, one of which will be chosen based on term
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    84
   capabilities, etc.")
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    85
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    86
(defun solarized-color-definitions (mode)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    87
  (flet ((find-color (name)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    88
           (let ((index (if window-system
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    89
                            (if solarized-degrade
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    90
                                3
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    91
			      (if solarized-broken-srgb 2 1))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    92
			  (if (= solarized-termcolors 256)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    93
			      3
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    94
			    4))))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
    95
             (nth index (assoc name solarized-colors)))))
49
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    96
    (let ((base03      (find-color 'base03))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    97
          (base02      (find-color 'base02))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    98
          (base01      (find-color 'base01))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
    99
          (base00      (find-color 'base00))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   100
          (base0       (find-color 'base0))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   101
          (base1       (find-color 'base1))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   102
          (base2       (find-color 'base2))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   103
          (base3       (find-color 'base3))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   104
          (yellow      (find-color 'yellow))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   105
          (orange      (find-color 'orange))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   106
          (red         (find-color 'red))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   107
          (magenta     (find-color 'magenta))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   108
          (violet      (find-color 'violet))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   109
          (blue        (find-color 'blue))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   110
          (cyan        (find-color 'cyan))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   111
          (green       (find-color 'green))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   112
          (bold        (if solarized-bold 'bold 'normal))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   113
          (bright-bold (if solarized-bold 'normal 'bold))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   114
          (underline   (if solarized-underline t nil))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   115
          (opt-under   nil)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   116
          (italic      (if solarized-italic 'italic 'normal)))
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   117
      (when (eq 'light mode)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   118
        (rotatef base03 base3)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   119
        (rotatef base02 base2)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   120
        (rotatef base01 base1)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   121
        (rotatef base00 base0))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   122
      (let ((back base03))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   123
        (cond ((eq 'high solarized-contrast)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   124
               (let ((orig-base3 base3))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   125
                 (rotatef base01 base00 base0 base1 base2 base3)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   126
                 (setf base3 orig-base3)))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   127
              ((eq 'low solarized-contrast)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   128
               (setf back      base02
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   129
                     opt-under t)))
49
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   130
        (let ((bg-back `(:background ,back))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   131
              (bg-base03 `(:background ,base03))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   132
              (bg-base02 `(:background ,base02))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   133
              (bg-base01 `(:background ,base01))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   134
              (bg-base00 `(:background ,base00))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   135
              (bg-base0 `(:background ,base0))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   136
              (bg-base1 `(:background ,base1))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   137
              (bg-base2 `(:background ,base2))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   138
              (bg-base3 `(:background ,base3))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   139
              (bg-green `(:background ,green))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   140
              (bg-yellow `(:background ,yellow))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   141
              (bg-orange `(:background ,orange))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   142
              (bg-red `(:background ,red))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   143
              (bg-magenta `(:background ,magenta))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   144
              (bg-violet `(:background ,violet))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   145
              (bg-blue `(:background ,blue))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   146
              (bg-cyan `(:background ,cyan))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   147
              
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   148
              (fg-base03 `(:foreground ,base03))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   149
              (fg-base02 `(:foreground ,base02))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   150
              (fg-base01 `(:foreground ,base01))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   151
              (fg-base00 `(:foreground ,base00))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   152
              (fg-base0 `(:foreground ,base0))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   153
              (fg-base1 `(:foreground ,base1))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   154
              (fg-base2 `(:foreground ,base2))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   155
              (fg-base3 `(:foreground ,base3))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   156
              (fg-green `(:foreground ,green))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   157
              (fg-yellow `(:foreground ,yellow))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   158
              (fg-orange `(:foreground ,orange))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   159
              (fg-red `(:foreground ,red))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   160
              (fg-magenta `(:foreground ,magenta))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   161
              (fg-violet `(:foreground ,violet))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   162
              (fg-blue `(:foreground ,blue))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   163
              (fg-cyan `(:foreground ,cyan))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   164
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   165
              (fmt-bold `(:weight ,bold))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   166
              (fmt-bldi `(:weight ,bold))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   167
              (fmt-undr `(:underline ,underline))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   168
              (fmt-undb `(:underline ,underline :weight ,bold))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   169
              (fmt-undi `(:underline ,underline))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   170
              (fmt-uopt `(:underline ,opt-under))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   171
              (fmt-curl `(:underline t)) ; FIXME: not quite the same
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   172
              (fmt-ital `(:slant ,italic))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   173
              (fmt-stnd `(:inverse-video t)) ; FIXME: not quite the same
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   174
              (fmt-revr `(:inverse-video t))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   175
              (fmt-revb `(:inverse-video t :weight ,bold))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   176
              (fmt-revbb `(:inverse-video t :weight ,bright-bold))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   177
              (fmt-revbbu `(:inverse-video t
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   178
                            :weight ,bright-bold
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   179
                            :underline ,underline)))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   180
          `((;; basic
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   181
             (default ((t (,@fg-base0 ,@bg-back)))) ; Normal
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   182
             (cursor ((t (,@fg-base03 ,@bg-base0)))) ; Cursor
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   183
             (escape-glyph-face ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   184
             (fringe ((t (,@fg-base01 ,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   185
             (linum ((t (,@fg-base01 ,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   186
             (header-line ((t (,@fg-base0 ,@bg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   187
             (highlight ((t (,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   188
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   189
             (hl-line ((t (,@fmt-uopt ,@bg-base02)))) ; CursorLine
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   190
             (isearch ((t (,@fmt-stnd ,@fg-orange)))) ; IncSearch
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   191
             (lazy-highlight ((t (,@bg-base2 ,@fg-base00))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   192
             (link ((t (,@fmt-undr ,@fg-violet))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   193
             (link-visited ((t (,@fmt-undr ,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   194
             (menu ((t (,@fg-base0 ,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   195
             (minibuffer-prompt ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   196
             (mode-line
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   197
              ((t (,@fg-base1 ,@bg-base02 :box (:line-width 1 :color ,base1)))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   198
             (mode-line-buffer-id ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   199
             (mode-line-inactive
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   200
              ((t (,@fg-base0  ,@bg-base02
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   201
                               :box (:line-width 1 :color ,base02)))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   202
             (region ((t (,@fg-base01 ,@bg-base03 ,@fmt-revbb)))) ; Visual
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   203
             (secondary-selection ((t (,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   204
             (shadow ((t (,@fg-base01))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   205
             (trailing-whitespace ((t (,@fmt-revr ,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   206
             (vertical-border ((t (,@fg-base0))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   207
             ;; comint
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   208
             (comint-highlight-prompt ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   209
             ;; compilation
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   210
             (compilation-info ((t (,@fmt-bold ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   211
             (compilation-warning ((t (,@fmt-bold ,@fg-orange))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   212
             ;; custom
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   213
             (custom-button
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   214
              ((t (,@fg-base1 ,@bg-base02
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   215
                              :box (:line-width 2 :style released-button)))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   216
             (custom-button-mouse
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   217
              ((t (,@fmt-revr ,@fg-base1 ,@bg-base02 :inherit custom-button))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   218
             (custom-button-pressed
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   219
              ((t (,@fmt-revr ,@fg-base1 ,@bg-base02
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   220
                              :box (:line-width 2 :style pressed-button)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   221
                              :inherit custom-button-mouse))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   222
             (custom-changed ((t (,@fmt-revr ,@fg-blue ,@bg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   223
             (custom-comment ((t (,@fg-base1 ,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   224
             (custom-comment-tag ((t (,@fg-base1 ,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   225
             (custom-documentation ((t (:inherit default))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   226
             (custom-group-tag ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   227
             (custom-group-tag-1 ((t (,fmt-bold ,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   228
             (custom-invalid ((t (,@fmt-revr ,@fg-red ,@bg-back))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   229
             (custom-link ((t (,@fg-violet))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   230
             (custom-state ((t (,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   231
             (custom-variable-tag ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   232
             ;; diff - DiffAdd, DiffChange, DiffDelete, and DiffText
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   233
             ,@(case solarized-diff-mode
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   234
                 (high
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   235
                  `((diff-added ((t (,@fmt-revr ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   236
                    (diff-changed ((t (,@fmt-revr ,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   237
                    (diff-removed ((t (,@fmt-revr ,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   238
                    (diff-header ((t (,@fmt-revr ,@fg-blue ,@bg-back))))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   239
                 (low
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   240
                  `((diff-added ((t (,@fmt-undr ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   241
                    (diff-changed ((t (,@fmt-undr ,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   242
                    (diff-removed ((t (,@fmt-bold ,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   243
                    (diff-header ((t (,@fmt-undr ,@fg-blue ,@bg-back))))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   244
                 (normal
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   245
                  (if window-system
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   246
                      `((diff-added ((t (,@fmt-bold ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   247
                        (diff-changed ((t (,@fmt-bold ,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   248
                        (diff-removed ((t (,@fmt-bold ,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   249
                        (diff-header ((t (,@fmt-bold ,@fg-blue ,@bg-back)))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   250
                    `((diff-added ((t (,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   251
                      (diff-changed ((t (,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   252
                      (diff-removed ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   253
                      (diff-header ((t (,@fg-blue ,@bg-back))))))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   254
             (diff-file-header ((t (,@bg-back))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   255
             (diff-refine-change ((t (,@bg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   256
             ;; IDO
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   257
             (ido-only-match ((t (,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   258
             (ido-subdir ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   259
             (ido-first-match ((t (,@fmt-bold ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   260
             ;; emacs-wiki
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   261
             (emacs-wiki-bad-link-face ((t (,@fmt-undr ,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   262
             (emacs-wiki-link-face ((t (,@fmt-undr ,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   263
             (emacs-wiki-verbatim-face ((t (,@fmt-undr ,@fg-base00))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   264
             ;; eshell
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   265
             (eshell-ls-archive ((t (,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   266
             (eshell-ls-backup ((t (,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   267
             (eshell-ls-clutter ((t (,@fg-orange))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   268
             (eshell-ls-directory ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   269
             (eshell-ls-executable ((t (,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   270
             (eshell-ls-missing ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   271
             (eshell-ls-product ((t (,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   272
             (eshell-ls-readonly ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   273
             (eshell-ls-special ((t (,@fg-violet))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   274
             (eshell-ls-symlink ((t (,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   275
             (eshell-ls-unreadable ((t (,@fg-base00))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   276
             (eshell-prompt ((t (,@fmt-bold ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   277
             ;; font-lock
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   278
             (font-lock-builtin-face ((t (,@fg-green)))) ; Statement
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   279
             (font-lock-comment-face ((t (,@fmt-ital ,@fg-base01)))) ; Comment
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   280
             (font-lock-constant-face ((t (,@fg-cyan)))) ; Constant
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   281
             (font-lock-function-name-face ((t (,@fg-blue)))) ; Identifier
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   282
             (font-lock-keyword-face ((t (,@fg-green)))) ; Statement
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   283
             (font-lock-string-face ((t (,@fg-cyan)))) ; Constant
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   284
             (font-lock-type-face ((t (,@fg-yellow)))) ; Type
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   285
             (font-lock-variable-name-face ((t (,@fg-blue)))) ; Identifier
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   286
             (font-lock-warning-face ((t (,@fmt-bold ,@fg-red)))) ; Error
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   287
             (font-lock-doc-face ((t (,@fmt-ital ,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   288
             (font-lock-color-constant-face ((t (,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   289
             (font-lock-comment-delimiter-face  ; Comment
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   290
              ((t (,@fmt-ital ,@fg-base01))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   291
             (font-lock-doc-string-face ((t (,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   292
             (font-lock-preprocessor-face ((t (,@fg-orange)))) ; PreProc
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   293
             (font-lock-reference-face ((t (,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   294
             (font-lock-negation-char-face ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   295
             (font-lock-other-type-face ((t (,@fmt-ital ,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   296
             (font-lock-regexp-grouping-construct ((t (,@fg-orange))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   297
             (font-lock-special-keyword-face ((t (,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   298
             (font-lock-exit-face ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   299
             (font-lock-other-emphasized-face ((t (,@fmt-bldi ,@fg-violet))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   300
             (font-lock-regexp-grouping-backslash ((t (,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   301
             ;; info
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   302
             (info-xref ((t (,@fmt-undr ,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   303
             (info-xref-visited ((t (,@fg-magenta :inherit info-xref))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   304
             ;; org
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   305
             (org-hide ((t (,@fg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   306
             (org-todo ((t (,@fmt-bold ,@fg-base03 ,@bg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   307
             (org-done ((t (,@fmt-bold ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   308
             (org-todo-kwd-face ((t (,@fg-red ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   309
             (org-done-kwd-face ((t (,@fg-green ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   310
             (org-project-kwd-face ((t (,@fg-violet ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   311
             (org-waiting-kwd-face ((t (,@fg-orange ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   312
             (org-someday-kwd-face ((t (,@fg-blue ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   313
             (org-started-kwd-face ((t (,@fg-yellow ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   314
             (org-cancelled-kwd-face ((t (,@fg-green ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   315
             (org-delegated-kwd-face ((t (,@fg-cyan ,@bg-base03))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   316
             ;; show-paren - MatchParen
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   317
             (show-paren-match-face ((t (,@fg-cyan ,@fg-base01))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   318
             (show-paren-mismatch-face ((t (,@fg-red ,@fg-base01))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   319
             ;; widgets
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   320
             (widget-field
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   321
              ((t (,@fg-base1 ,@bg-base02 :box (:line-width 1 :color ,base2)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   322
                              :inherit default))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   323
             (widget-single-line-field ((t (:inherit widget-field))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   324
             ;; extra modules
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   325
             ;; -------------
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   326
             ;; gnus
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   327
             (gnus-cite-1 ((t (,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   328
             (gnus-cite-2 ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   329
             (gnus-cite-3 ((t (,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   330
             (gnus-cite-4 ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   331
             (gnus-cite-5 ((t (,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   332
             (gnus-cite-6 ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   333
             (gnus-cite-7 ((t (,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   334
             (gnus-cite-8 ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   335
             (gnus-cite-9 ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   336
             (gnus-cite-10 ((t (,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   337
             (gnus-cite-11 ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   338
             (gnus-group-mail-1 ((t (,@fmt-bold ,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   339
             (gnus-group-mail-1-empty ((t (,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   340
             (gnus-group-mail-2 ((t (,@fmt-bold ,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   341
             (gnus-group-mail-2-empty ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   342
             (gnus-group-mail-3 ((t (,@fmt-bold ,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   343
             (gnus-group-mail-3-empty ((t (,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   344
             (gnus-group-mail-low ((t (,@fmt-bold ,@fg-base00))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   345
             (gnus-group-mail-low-empty ((t (,@fg-base00))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   346
             (gnus-group-news-1 ((t (,@fmt-bold ,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   347
             (gnus-group-news-1-empty ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   348
             (gnus-group-news-2 ((t (,@fmt-bold ,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   349
             (gnus-group-news-2-empty ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   350
             (gnus-group-news-low ((t (,@fmt-bold ,@fg-violet))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   351
             (gnus-group-news-low-empty ((t (,@fg-violet))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   352
             (gnus-header-content ((t (,@fmt-ital ,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   353
             (gnus-header-from ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   354
             (gnus-header-name ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   355
             (gnus-header-newsgroups ((t (,@fmt-ital ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   356
             (gnus-header-subject ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   357
             (gnus-server-agent ((t (,@fmt-bold ,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   358
             (gnus-server-closed ((t (,@fmt-ital ,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   359
             (gnus-server-denied ((t (,@fmt-bold ,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   360
             (gnus-server-offline ((t (,@fmt-bold ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   361
             (gnus-server-opened ((t (,@fmt-bold ,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   362
             (gnus-splash ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   363
             (gnus-summary-high-ancient ((t (,@fmt-bold ,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   364
             (gnus-summary-high-read ((t (,@fmt-bold ,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   365
             (gnus-summary-high-ticked ((t (,@fmt-bold ,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   366
             (gnus-summary-high-undownloaded ((t (,@fmt-bold ,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   367
             (gnus-summary-low-ancient ((t (,@fmt-ital ,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   368
             (gnus-summary-low-read ((t (,@fmt-ital ,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   369
             (gnus-summary-low-ticked ((t (,@fmt-ital ,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   370
             (gnus-summary-low-undownloaded ((t (,@fmt-ital ,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   371
             (gnus-summary-normal-ancient ((t (,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   372
             (gnus-summary-normal-read ((t (,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   373
             (gnus-summary-normal-ticked ((t (,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   374
             (gnus-summary-normal-undownloaded ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   375
             ;; Flymake
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   376
             (flymake-errline ((t (,@bg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   377
             (flymake-warnline ((t (,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   378
             ;; whitespace
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   379
             (whitespace-empty ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   380
             (whitespace-hspace ((t (,@fg-orange))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   381
             (whitespace-indentation ((t (,@fg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   382
             (whitespace-space ((t (,@fg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   383
             (whitespace-space-after-tab ((t (,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   384
             (whitespace-space-before-tab ((t (,@fmt-bold ,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   385
             (whitespace-tab ((t (,@fg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   386
             (whitespace-trailing ((t (,@fmt-bold ,@fg-red ,@bg-base02))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   387
             (whitespace-highlight-face ((t (,@fg-red ,@bg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   388
             ;; Message
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   389
             (message-mml ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   390
             (message-cited-text ((t (,@fg-base2))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   391
             (message-separator ((t (,@fg-base3))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   392
             (message-header-xheader ((t (,@fg-violet))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   393
             (message-header-name ((t (,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   394
             (message-header-other ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   395
             (message-header-newsgroups ((t (,@fmt-bldi ,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   396
             (message-header-subject ((t (,@fg-base00))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   397
             (message-header-cc ((t (,@fmt-bold ,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   398
             (message-header-to ((t (,@fmt-bold ,@fg-base1))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   399
             ;; rainbow-delimiters
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   400
             (rainbow-delimiters-depth-1-face ((t (,@fg-cyan))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   401
             (rainbow-delimiters-depth-2-face ((t (,@fg-yellow))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   402
             (rainbow-delimiters-depth-3-face ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   403
             (rainbow-delimiters-depth-4-face ((t (,@fg-red))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   404
             (rainbow-delimiters-depth-5-face ((t (,@fg-green))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   405
             (rainbow-delimiters-depth-6-face ((t (,@fg-blue))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   406
             (rainbow-delimiters-depth-7-face ((t (,@fg-orange))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   407
             (rainbow-delimiters-depth-8-face ((t (,@fg-magenta))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   408
             (rainbow-delimiters-depth-9-face ((t (,@fg-base0)))))
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   409
            ((foreground-color . ,base0)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   410
             (background-color . ,base03)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   411
             (background-mode . ,mode)
942fe8d1a653 Updated solarized again.
Luke Hoersten <Luke@Hoersten.org>
parents: 48
diff changeset
   412
             (cursor-color . ,base0))))))))
47
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   413
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   414
(defmacro create-solarized-theme (mode)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   415
  (let* ((theme-name (intern (concat "solarized-" (symbol-name mode))))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   416
         (defs (solarized-color-definitions mode))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   417
         (theme-vars (mapcar (lambda (def) (list (car def) (cdr def)))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   418
                             (second defs)))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   419
         (theme-faces (first defs)))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   420
    `(progn
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   421
       (deftheme ,theme-name ,solarized-description)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   422
       (apply 'custom-theme-set-variables ',theme-name ',theme-vars)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   423
       (apply 'custom-theme-set-faces ',theme-name ',theme-faces)
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   424
       (provide-theme ',theme-name))))
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   425
3415a60d5fd0 Added solarized color theme.
Luke Hoersten <Luke@Hoersten.org>
parents:
diff changeset
   426
(provide 'solarized-definitions)