--- a/thirdparty/color-theme-solarized/solarized-definitions.el Sat Jun 22 22:54:53 2013 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,426 +0,0 @@
-(eval-when-compile
- (require 'cl))
-
-(defconst solarized-description
- "Color theme by Ethan Schoonover, created 2011-03-24.
-Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized.")
-
-(defcustom solarized-degrade nil
- "For test purposes only; when in GUI mode, forces Solarized to use the 256
-degraded color mode to test the approximate color values for accuracy."
- :type 'boolean
- :group 'solarized)
-
-(defcustom solarized-diff-mode 'normal
- "Sets the level of highlighting to use in diff-like modes."
- :type 'symbol
- :options '(high normal low)
- :group 'solarized)
-
-(defcustom solarized-bold t
- "Stops Solarized from displaying bold when nil."
- :type 'boolean
- :group 'solarized)
-
-(defcustom solarized-underline t
- "Stops Solarized from displaying underlines when nil."
- :type 'boolean
- :group 'solarized)
-
-(defcustom solarized-italic t
- "Stops Solarized from displaying italics when nil."
- :type 'boolean
- :group 'solarized)
-
-(defcustom solarized-termcolors 16
- "This setting applies to emacs in terminal (non-GUI) mode.
-If set to 16, emacs will use the terminal emulator's colorscheme (best option
-as long as you've set your emulator's colors to the Solarized palette). If
-set to 256 and your terminal is capable of displaying 256 colors, emacs will
-use the 256 degraded color mode."
- :type 'integer
- :options '(16 256)
- :group 'solarized)
-
-(defcustom solarized-contrast 'normal
- "Stick with normal! It's been carefully tested. Setting this option to high or
-low does use the same Solarized palette but simply shifts some values up or
-down in order to expand or compress the tonal range displayed."
- :type 'symbol
- :options '(high normal low)
- :group 'solarized)
-
-(defcustom solarized-broken-srgb (if (eq system-type 'darwin) t nil)
- "Emacs bug #8402 results in incorrect color handling on Macs. If this is t
-(the default on Macs), Solarized works around it with alternative colors.
-However, these colors are not totally portable, so you may be able to edit
-the \"Gen RGB\" column in solarized-definitions.el to improve them further."
- :type 'boolean
- :group 'solarized)
-
-;; FIXME: The Generic RGB colors will actually vary from device to device, but
-;; hopefully these are closer to the intended colors than the sRGB values
-;; that Emacs seems to dislike
-(defvar solarized-colors
- ;; name sRGB Gen RGB degraded ANSI(Solarized terminal)
- '((base03 "#002b36" "#042028" "#1c1c1c" "#7f7f7f")
- (base02 "#073642" "#0a2832" "#262626" "#000000")
- (base01 "#586e75" "#465a61" "#585858" "#00ff00")
- (base00 "#657b83" "#52676f" "#626262" "#ffff00")
- (base0 "#839496" "#708183" "#808080" "#5c5cff")
- (base1 "#93a1a1" "#81908f" "#8a8a8a" "#00ffff")
- (base2 "#eee8d5" "#e9e2cb" "#e4e4e4" "#e5e5e5")
- (base3 "#fdf6e3" "#fcf4dc" "#ffffd7" "#ffffff")
- (yellow "#b58900" "#a57705" "#af8700" "#cdcd00")
- (orange "#cb4b16" "#bd3612" "#d75f00" "#ff0000")
- (red "#dc322f" "#c60007" "#d70000" "#cd0000")
- (magenta "#d33682" "#c61b6e" "#af005f" "#cd00cd")
- (violet "#6c71c4" "#5859b7" "#5f5faf" "#ff00ff")
- (blue "#268bd2" "#2075c7" "#0087ff" "#0000ee")
- (cyan "#2aa198" "#259185" "#00afaf" "#00cdcd")
- (green "#859900" "#728a05" "#5f8700" "#00cd00"))
- "This is a table of all the colors used by the Solarized color theme. Each
- column is a different set, one of which will be chosen based on term
- capabilities, etc.")
-
-(defun solarized-color-definitions (mode)
- (flet ((find-color (name)
- (let ((index (if window-system
- (if solarized-degrade
- 3
- (if solarized-broken-srgb 2 1))
- (if (= solarized-termcolors 256)
- 3
- 4))))
- (nth index (assoc name solarized-colors)))))
- (let ((base03 (find-color 'base03))
- (base02 (find-color 'base02))
- (base01 (find-color 'base01))
- (base00 (find-color 'base00))
- (base0 (find-color 'base0))
- (base1 (find-color 'base1))
- (base2 (find-color 'base2))
- (base3 (find-color 'base3))
- (yellow (find-color 'yellow))
- (orange (find-color 'orange))
- (red (find-color 'red))
- (magenta (find-color 'magenta))
- (violet (find-color 'violet))
- (blue (find-color 'blue))
- (cyan (find-color 'cyan))
- (green (find-color 'green))
- (bold (if solarized-bold 'bold 'normal))
- (bright-bold (if solarized-bold 'normal 'bold))
- (underline (if solarized-underline t nil))
- (opt-under nil)
- (italic (if solarized-italic 'italic 'normal)))
- (when (eq 'light mode)
- (rotatef base03 base3)
- (rotatef base02 base2)
- (rotatef base01 base1)
- (rotatef base00 base0))
- (let ((back base03))
- (cond ((eq 'high solarized-contrast)
- (let ((orig-base3 base3))
- (rotatef base01 base00 base0 base1 base2 base3)
- (setf base3 orig-base3)))
- ((eq 'low solarized-contrast)
- (setf back base02
- opt-under t)))
- (let ((bg-back `(:background ,back))
- (bg-base03 `(:background ,base03))
- (bg-base02 `(:background ,base02))
- (bg-base01 `(:background ,base01))
- (bg-base00 `(:background ,base00))
- (bg-base0 `(:background ,base0))
- (bg-base1 `(:background ,base1))
- (bg-base2 `(:background ,base2))
- (bg-base3 `(:background ,base3))
- (bg-green `(:background ,green))
- (bg-yellow `(:background ,yellow))
- (bg-orange `(:background ,orange))
- (bg-red `(:background ,red))
- (bg-magenta `(:background ,magenta))
- (bg-violet `(:background ,violet))
- (bg-blue `(:background ,blue))
- (bg-cyan `(:background ,cyan))
-
- (fg-base03 `(:foreground ,base03))
- (fg-base02 `(:foreground ,base02))
- (fg-base01 `(:foreground ,base01))
- (fg-base00 `(:foreground ,base00))
- (fg-base0 `(:foreground ,base0))
- (fg-base1 `(:foreground ,base1))
- (fg-base2 `(:foreground ,base2))
- (fg-base3 `(:foreground ,base3))
- (fg-green `(:foreground ,green))
- (fg-yellow `(:foreground ,yellow))
- (fg-orange `(:foreground ,orange))
- (fg-red `(:foreground ,red))
- (fg-magenta `(:foreground ,magenta))
- (fg-violet `(:foreground ,violet))
- (fg-blue `(:foreground ,blue))
- (fg-cyan `(:foreground ,cyan))
-
- (fmt-bold `(:weight ,bold))
- (fmt-bldi `(:weight ,bold))
- (fmt-undr `(:underline ,underline))
- (fmt-undb `(:underline ,underline :weight ,bold))
- (fmt-undi `(:underline ,underline))
- (fmt-uopt `(:underline ,opt-under))
- (fmt-curl `(:underline t)) ; FIXME: not quite the same
- (fmt-ital `(:slant ,italic))
- (fmt-stnd `(:inverse-video t)) ; FIXME: not quite the same
- (fmt-revr `(:inverse-video t))
- (fmt-revb `(:inverse-video t :weight ,bold))
- (fmt-revbb `(:inverse-video t :weight ,bright-bold))
- (fmt-revbbu `(:inverse-video t
- :weight ,bright-bold
- :underline ,underline)))
- `((;; basic
- (default ((t (,@fg-base0 ,@bg-back)))) ; Normal
- (cursor ((t (,@fg-base03 ,@bg-base0)))) ; Cursor
- (escape-glyph-face ((t (,@fg-red))))
- (fringe ((t (,@fg-base01 ,@bg-base02))))
- (linum ((t (,@fg-base01 ,@bg-base02))))
- (header-line ((t (,@fg-base0 ,@bg-base2))))
- (highlight ((t (,@bg-base02))))
-
- (hl-line ((t (,@fmt-uopt ,@bg-base02)))) ; CursorLine
- (isearch ((t (,@fmt-stnd ,@fg-orange)))) ; IncSearch
- (lazy-highlight ((t (,@bg-base2 ,@fg-base00))))
- (link ((t (,@fmt-undr ,@fg-violet))))
- (link-visited ((t (,@fmt-undr ,@fg-magenta))))
- (menu ((t (,@fg-base0 ,@bg-base02))))
- (minibuffer-prompt ((t (,@fg-blue))))
- (mode-line
- ((t (,@fg-base1 ,@bg-base02 :box (:line-width 1 :color ,base1)))))
- (mode-line-buffer-id ((t (,@fg-base1))))
- (mode-line-inactive
- ((t (,@fg-base0 ,@bg-base02
- :box (:line-width 1 :color ,base02)))))
- (region ((t (,@fg-base01 ,@bg-base03 ,@fmt-revbb)))) ; Visual
- (secondary-selection ((t (,@bg-base02))))
- (shadow ((t (,@fg-base01))))
- (trailing-whitespace ((t (,@fmt-revr ,@fg-red))))
- (vertical-border ((t (,@fg-base0))))
- ;; comint
- (comint-highlight-prompt ((t (,@fg-blue))))
- ;; compilation
- (compilation-info ((t (,@fmt-bold ,@fg-green))))
- (compilation-warning ((t (,@fmt-bold ,@fg-orange))))
- ;; custom
- (custom-button
- ((t (,@fg-base1 ,@bg-base02
- :box (:line-width 2 :style released-button)))))
- (custom-button-mouse
- ((t (,@fmt-revr ,@fg-base1 ,@bg-base02 :inherit custom-button))))
- (custom-button-pressed
- ((t (,@fmt-revr ,@fg-base1 ,@bg-base02
- :box (:line-width 2 :style pressed-button)
- :inherit custom-button-mouse))))
- (custom-changed ((t (,@fmt-revr ,@fg-blue ,@bg-base3))))
- (custom-comment ((t (,@fg-base1 ,@bg-base02))))
- (custom-comment-tag ((t (,@fg-base1 ,@bg-base02))))
- (custom-documentation ((t (:inherit default))))
- (custom-group-tag ((t (,@fg-base1))))
- (custom-group-tag-1 ((t (,fmt-bold ,@fg-base1))))
- (custom-invalid ((t (,@fmt-revr ,@fg-red ,@bg-back))))
- (custom-link ((t (,@fg-violet))))
- (custom-state ((t (,@fg-green))))
- (custom-variable-tag ((t (,@fg-base1))))
- ;; diff - DiffAdd, DiffChange, DiffDelete, and DiffText
- ,@(case solarized-diff-mode
- (high
- `((diff-added ((t (,@fmt-revr ,@fg-green))))
- (diff-changed ((t (,@fmt-revr ,@fg-yellow))))
- (diff-removed ((t (,@fmt-revr ,@fg-red))))
- (diff-header ((t (,@fmt-revr ,@fg-blue ,@bg-back))))))
- (low
- `((diff-added ((t (,@fmt-undr ,@fg-green))))
- (diff-changed ((t (,@fmt-undr ,@fg-yellow))))
- (diff-removed ((t (,@fmt-bold ,@fg-red))))
- (diff-header ((t (,@fmt-undr ,@fg-blue ,@bg-back))))))
- (normal
- (if window-system
- `((diff-added ((t (,@fmt-bold ,@fg-green))))
- (diff-changed ((t (,@fmt-bold ,@fg-yellow))))
- (diff-removed ((t (,@fmt-bold ,@fg-red))))
- (diff-header ((t (,@fmt-bold ,@fg-blue ,@bg-back)))))
- `((diff-added ((t (,@fg-green))))
- (diff-changed ((t (,@fg-yellow))))
- (diff-removed ((t (,@fg-red))))
- (diff-header ((t (,@fg-blue ,@bg-back))))))))
- (diff-file-header ((t (,@bg-back))))
- (diff-refine-change ((t (,@bg-base3))))
- ;; IDO
- (ido-only-match ((t (,@fg-green))))
- (ido-subdir ((t (,@fg-blue))))
- (ido-first-match ((t (,@fmt-bold ,@fg-green))))
- ;; emacs-wiki
- (emacs-wiki-bad-link-face ((t (,@fmt-undr ,@fg-red))))
- (emacs-wiki-link-face ((t (,@fmt-undr ,@fg-blue))))
- (emacs-wiki-verbatim-face ((t (,@fmt-undr ,@fg-base00))))
- ;; eshell
- (eshell-ls-archive ((t (,@fg-magenta))))
- (eshell-ls-backup ((t (,@fg-yellow))))
- (eshell-ls-clutter ((t (,@fg-orange))))
- (eshell-ls-directory ((t (,@fg-blue))))
- (eshell-ls-executable ((t (,@fg-green))))
- (eshell-ls-missing ((t (,@fg-red))))
- (eshell-ls-product ((t (,@fg-yellow))))
- (eshell-ls-readonly ((t (,@fg-base1))))
- (eshell-ls-special ((t (,@fg-violet))))
- (eshell-ls-symlink ((t (,@fg-cyan))))
- (eshell-ls-unreadable ((t (,@fg-base00))))
- (eshell-prompt ((t (,@fmt-bold ,@fg-green))))
- ;; font-lock
- (font-lock-builtin-face ((t (,@fg-green)))) ; Statement
- (font-lock-comment-face ((t (,@fmt-ital ,@fg-base01)))) ; Comment
- (font-lock-constant-face ((t (,@fg-cyan)))) ; Constant
- (font-lock-function-name-face ((t (,@fg-blue)))) ; Identifier
- (font-lock-keyword-face ((t (,@fg-green)))) ; Statement
- (font-lock-string-face ((t (,@fg-cyan)))) ; Constant
- (font-lock-type-face ((t (,@fg-yellow)))) ; Type
- (font-lock-variable-name-face ((t (,@fg-blue)))) ; Identifier
- (font-lock-warning-face ((t (,@fmt-bold ,@fg-red)))) ; Error
- (font-lock-doc-face ((t (,@fmt-ital ,@fg-cyan))))
- (font-lock-color-constant-face ((t (,@fg-green))))
- (font-lock-comment-delimiter-face ; Comment
- ((t (,@fmt-ital ,@fg-base01))))
- (font-lock-doc-string-face ((t (,@fg-green))))
- (font-lock-preprocessor-face ((t (,@fg-orange)))) ; PreProc
- (font-lock-reference-face ((t (,@fg-cyan))))
- (font-lock-negation-char-face ((t (,@fg-red))))
- (font-lock-other-type-face ((t (,@fmt-ital ,@fg-blue))))
- (font-lock-regexp-grouping-construct ((t (,@fg-orange))))
- (font-lock-special-keyword-face ((t (,@fg-magenta))))
- (font-lock-exit-face ((t (,@fg-red))))
- (font-lock-other-emphasized-face ((t (,@fmt-bldi ,@fg-violet))))
- (font-lock-regexp-grouping-backslash ((t (,@fg-yellow))))
- ;; info
- (info-xref ((t (,@fmt-undr ,@fg-blue))))
- (info-xref-visited ((t (,@fg-magenta :inherit info-xref))))
- ;; org
- (org-hide ((t (,@fg-base03))))
- (org-todo ((t (,@fmt-bold ,@fg-base03 ,@bg-red))))
- (org-done ((t (,@fmt-bold ,@fg-green))))
- (org-todo-kwd-face ((t (,@fg-red ,@bg-base03))))
- (org-done-kwd-face ((t (,@fg-green ,@bg-base03))))
- (org-project-kwd-face ((t (,@fg-violet ,@bg-base03))))
- (org-waiting-kwd-face ((t (,@fg-orange ,@bg-base03))))
- (org-someday-kwd-face ((t (,@fg-blue ,@bg-base03))))
- (org-started-kwd-face ((t (,@fg-yellow ,@bg-base03))))
- (org-cancelled-kwd-face ((t (,@fg-green ,@bg-base03))))
- (org-delegated-kwd-face ((t (,@fg-cyan ,@bg-base03))))
- ;; show-paren - MatchParen
- (show-paren-match-face ((t (,@fg-cyan ,@fg-base01))))
- (show-paren-mismatch-face ((t (,@fg-red ,@fg-base01))))
- ;; widgets
- (widget-field
- ((t (,@fg-base1 ,@bg-base02 :box (:line-width 1 :color ,base2)
- :inherit default))))
- (widget-single-line-field ((t (:inherit widget-field))))
- ;; extra modules
- ;; -------------
- ;; gnus
- (gnus-cite-1 ((t (,@fg-magenta))))
- (gnus-cite-2 ((t (,@fg-base2))))
- (gnus-cite-3 ((t (,@fg-base3))))
- (gnus-cite-4 ((t (,@fg-base1))))
- (gnus-cite-5 ((t (,@fg-magenta))))
- (gnus-cite-6 ((t (,@fg-base2))))
- (gnus-cite-7 ((t (,@fg-base3))))
- (gnus-cite-8 ((t (,@fg-base1))))
- (gnus-cite-9 ((t (,@fg-base2))))
- (gnus-cite-10 ((t (,@fg-base3))))
- (gnus-cite-11 ((t (,@fg-blue))))
- (gnus-group-mail-1 ((t (,@fmt-bold ,@fg-base3))))
- (gnus-group-mail-1-empty ((t (,@fg-base3))))
- (gnus-group-mail-2 ((t (,@fmt-bold ,@fg-base2))))
- (gnus-group-mail-2-empty ((t (,@fg-base2))))
- (gnus-group-mail-3 ((t (,@fmt-bold ,@fg-magenta))))
- (gnus-group-mail-3-empty ((t (,@fg-magenta))))
- (gnus-group-mail-low ((t (,@fmt-bold ,@fg-base00))))
- (gnus-group-mail-low-empty ((t (,@fg-base00))))
- (gnus-group-news-1 ((t (,@fmt-bold ,@fg-base1))))
- (gnus-group-news-1-empty ((t (,@fg-base1))))
- (gnus-group-news-2 ((t (,@fmt-bold ,@fg-blue))))
- (gnus-group-news-2-empty ((t (,@fg-blue))))
- (gnus-group-news-low ((t (,@fmt-bold ,@fg-violet))))
- (gnus-group-news-low-empty ((t (,@fg-violet))))
- (gnus-header-content ((t (,@fmt-ital ,@fg-cyan))))
- (gnus-header-from ((t (,@fg-base2))))
- (gnus-header-name ((t (,@fg-blue))))
- (gnus-header-newsgroups ((t (,@fmt-ital ,@fg-green))))
- (gnus-header-subject ((t (,@fg-base1))))
- (gnus-server-agent ((t (,@fmt-bold ,@fg-base3))))
- (gnus-server-closed ((t (,@fmt-ital ,@fg-base1))))
- (gnus-server-denied ((t (,@fmt-bold ,@fg-base2))))
- (gnus-server-offline ((t (,@fmt-bold ,@fg-green))))
- (gnus-server-opened ((t (,@fmt-bold ,@fg-cyan))))
- (gnus-splash ((t (,@fg-base2))))
- (gnus-summary-high-ancient ((t (,@fmt-bold ,@fg-magenta))))
- (gnus-summary-high-read ((t (,@fmt-bold ,@fg-base1))))
- (gnus-summary-high-ticked ((t (,@fmt-bold ,@fg-base3))))
- (gnus-summary-high-undownloaded ((t (,@fmt-bold ,@fg-base2))))
- (gnus-summary-low-ancient ((t (,@fmt-ital ,@fg-magenta))))
- (gnus-summary-low-read ((t (,@fmt-ital ,@fg-base1))))
- (gnus-summary-low-ticked ((t (,@fmt-ital ,@fg-base3))))
- (gnus-summary-low-undownloaded ((t (,@fmt-ital ,@fg-base2))))
- (gnus-summary-normal-ancient ((t (,@fg-magenta))))
- (gnus-summary-normal-read ((t (,@fg-base1))))
- (gnus-summary-normal-ticked ((t (,@fg-base3))))
- (gnus-summary-normal-undownloaded ((t (,@fg-base2))))
- ;; Flymake
- (flymake-errline ((t (,@bg-base3))))
- (flymake-warnline ((t (,@bg-base02))))
- ;; whitespace
- (whitespace-empty ((t (,@fg-red))))
- (whitespace-hspace ((t (,@fg-orange))))
- (whitespace-indentation ((t (,@fg-base02))))
- (whitespace-space ((t (,@fg-base02))))
- (whitespace-space-after-tab ((t (,@fg-cyan))))
- (whitespace-space-before-tab ((t (,@fmt-bold ,@fg-red))))
- (whitespace-tab ((t (,@fg-base02))))
- (whitespace-trailing ((t (,@fmt-bold ,@fg-red ,@bg-base02))))
- (whitespace-highlight-face ((t (,@fg-red ,@bg-blue))))
- ;; Message
- (message-mml ((t (,@fg-blue))))
- (message-cited-text ((t (,@fg-base2))))
- (message-separator ((t (,@fg-base3))))
- (message-header-xheader ((t (,@fg-violet))))
- (message-header-name ((t (,@fg-cyan))))
- (message-header-other ((t (,@fg-red))))
- (message-header-newsgroups ((t (,@fmt-bldi ,@fg-yellow))))
- (message-header-subject ((t (,@fg-base00))))
- (message-header-cc ((t (,@fmt-bold ,@fg-green))))
- (message-header-to ((t (,@fmt-bold ,@fg-base1))))
- ;; rainbow-delimiters
- (rainbow-delimiters-depth-1-face ((t (,@fg-cyan))))
- (rainbow-delimiters-depth-2-face ((t (,@fg-yellow))))
- (rainbow-delimiters-depth-3-face ((t (,@fg-blue))))
- (rainbow-delimiters-depth-4-face ((t (,@fg-red))))
- (rainbow-delimiters-depth-5-face ((t (,@fg-green))))
- (rainbow-delimiters-depth-6-face ((t (,@fg-blue))))
- (rainbow-delimiters-depth-7-face ((t (,@fg-orange))))
- (rainbow-delimiters-depth-8-face ((t (,@fg-magenta))))
- (rainbow-delimiters-depth-9-face ((t (,@fg-base0)))))
- ((foreground-color . ,base0)
- (background-color . ,base03)
- (background-mode . ,mode)
- (cursor-color . ,base0))))))))
-
-(defmacro create-solarized-theme (mode)
- (let* ((theme-name (intern (concat "solarized-" (symbol-name mode))))
- (defs (solarized-color-definitions mode))
- (theme-vars (mapcar (lambda (def) (list (car def) (cdr def)))
- (second defs)))
- (theme-faces (first defs)))
- `(progn
- (deftheme ,theme-name ,solarized-description)
- (apply 'custom-theme-set-variables ',theme-name ',theme-vars)
- (apply 'custom-theme-set-faces ',theme-name ',theme-faces)
- (provide-theme ',theme-name))))
-
-(provide 'solarized-definitions)