From 80afaacc6ac40b5cdec84c19ec9cb5dc9a839605 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Mon, 9 May 2011 23:00:15 +0800 Subject: [PATCH 01/21] add README --- README | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..0b8367f --- /dev/null +++ b/README @@ -0,0 +1,5 @@ +zenburn.el --- just some alien fruit salad to keep you in the zone + +Get the [[http://www.emacswiki.org/emacs/ColorTheme][color-theme]] library, put zenburn.el in your [[http://www.emacswiki.org/emacs/LoadPath#toc2][emacs load-path]] and then: + +(require 'zenburn) From 3940df87974b4e71689e32c6fb59f6d4f067bcab Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Mon, 9 May 2011 23:07:25 +0800 Subject: [PATCH 02/21] rename README to README.org --- README => README.org | 4 ++++ 1 file changed, 4 insertions(+) rename README => README.org (69%) diff --git a/README b/README.org similarity index 69% rename from README rename to README.org index 0b8367f..7e02651 100644 --- a/README +++ b/README.org @@ -3,3 +3,7 @@ zenburn.el --- just some alien fruit salad to keep you in the zone Get the [[http://www.emacswiki.org/emacs/ColorTheme][color-theme]] library, put zenburn.el in your [[http://www.emacswiki.org/emacs/LoadPath#toc2][emacs load-path]] and then: (require 'zenburn) + +It looks like this: + +[[http://2.bp.blogspot.com/_kGFGcbwevHE/S7hudg01isI/AAAAAAAAAfw/-jq5xEoP9LA/s1600/zenburn.png]] From 4dc7c272d7434ee9441c6a9acadb3cb334c2cbca Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Mon, 9 May 2011 23:09:29 +0800 Subject: [PATCH 03/21] README.org: add copyright pointer --- README.org | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.org b/README.org index 7e02651..ded75b9 100644 --- a/README.org +++ b/README.org @@ -1,5 +1,10 @@ zenburn.el --- just some alien fruit salad to keep you in the zone +Zenburn is a programming syntax highlighting color scheme created by +Jani Nurminen in 2002. + +zenburn.el is copyrighted as stated in its text. + Get the [[http://www.emacswiki.org/emacs/ColorTheme][color-theme]] library, put zenburn.el in your [[http://www.emacswiki.org/emacs/LoadPath#toc2][emacs load-path]] and then: (require 'zenburn) From f3a5a30522211d28a946decfc55bcdedb6569b38 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 00:57:59 +0800 Subject: [PATCH 04/21] zenburn.el: M-x whitespace-cleanup --- zenburn.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenburn.el b/zenburn.el index 04e4dcc..a92a16c 100644 --- a/zenburn.el +++ b/zenburn.el @@ -426,7 +426,7 @@ ((t (:inherit zenburn-primary-1)))) `(elscreen-tab-other-screen ((t (:foreground ,zenburn-yellow :background ,zenburn-green)))) - + '(flyspell-duplicate ((t (:inherit zenburn-primary-1)))) '(flyspell-incorrect ((t (:inherit zenburn-primary-2)))) @@ -472,7 +472,7 @@ `(gnus-group-news-1-empty ((t (:foreground ,zenburn-yellow)))) `(gnus-group-news-2-empty ((t (:foreground ,zenburn-green+3)))) `(gnus-group-news-3-empty ((t (:foreground ,zenburn-green+1)))) - `(gnus-group-news-4-empty ((t (:foreground ,zenburn-blue-2)))) + `(gnus-group-news-4-empty ((t (:foreground ,zenburn-blue-2)))) `(gnus-group-news-5-empty ((t (:foreground ,zenburn-blue-3)))) `(gnus-group-news-6-empty ((t (:inherit zenburn-lowlight-1)))) `(gnus-group-news-low-empty ((t (:inherit zenburn-lowlight-1)))) From 77ed7a59437eb7f84f97700a1a0ddb6bfb72a2b5 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 01:43:52 +0800 Subject: [PATCH 05/21] zenburn.el: fix zenburn-highlight-alerting to not be red-on-red in terminals --- zenburn.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenburn.el b/zenburn.el index a92a16c..52fc87b 100644 --- a/zenburn.el +++ b/zenburn.el @@ -102,8 +102,8 @@ '(zenburn-highlight-damp ((t (:foreground "#88b090" :background "#2e3330")))) - '(zenburn-highlight-alerting - ((t (:foreground "#e37170" :background "#332323")))) + `(zenburn-highlight-alerting + ((t (:foreground ,zenburn-fg :background "#332323")))) '(zenburn-highlight-subtle ((t (:background "#464646")))) From 55e10f83fe3a72df602be948d8680b92b2659fb5 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 02:51:08 +0800 Subject: [PATCH 06/21] zenburn.el: add whitespace between color-theme-install args, sort 'default' face definition first list color-theme-print does; indent-region on whole file --- zenburn.el | 1416 ++++++++++++++++++++++++++-------------------------- 1 file changed, 710 insertions(+), 706 deletions(-) diff --git a/zenburn.el b/zenburn.el index 52fc87b..a1f1f84 100644 --- a/zenburn.el +++ b/zenburn.el @@ -67,11 +67,13 @@ (color-theme-install (append (list 'color-theme-zenburn + `((background-color . ,zenburn-bg) (background-mode . dark) (border-color . ,zenburn-bg) (foreground-color . ,zenburn-fg) (mouse-color . ,zenburn-fg)) + `((emms-mode-line-icon-color . ,zenburn-fg) (goto-address-mail-face . italic) (goto-address-mail-mouse-face . secondary-selection) @@ -84,712 +86,714 @@ (view-highlight-face . hover-highlight) (widget-mouse-face . hover-highlight)) - '(bold ((t (:weight bold)))) - '(bold-italic ((t (:italic t :weight bold)))) - `(default ((t (:background ,zenburn-bg :foreground ,zenburn-fg)))) - '(fixed-pitch ((t (:weight bold)))) - '(italic ((t (:slant italic)))) - '(underline ((t (:underline t)))) - - `(zenburn-background-1 ((t (:background ,zenburn-bg+1)))) - `(zenburn-background-2 ((t (:background ,zenburn-bg+2)))) - - `(zenburn-primary-1 ((t (:foreground ,zenburn-yellow :weight bold)))) - `(zenburn-primary-2 ((t (:foreground ,zenburn-orange :weight bold)))) - '(zenburn-primary-3 ((t (:foreground "#dfdfbf" :weight bold)))) - '(zenburn-primary-4 ((t (:foreground "#dca3a3" :weight bold)))) - '(zenburn-primary-5 ((t (:foreground "#94bff3" :weight bold)))) - - '(zenburn-highlight-damp - ((t (:foreground "#88b090" :background "#2e3330")))) - `(zenburn-highlight-alerting - ((t (:foreground ,zenburn-fg :background "#332323")))) - '(zenburn-highlight-subtle - ((t (:background "#464646")))) - - '(zenburn-lowlight-1 ((t (:foreground "#606060")))) - '(zenburn-lowlight-2 ((t (:foreground "#708070")))) - - `(zenburn-yellow ((t (:foreground ,zenburn-yellow)))) - `(zenburn-orange ((t (:foreground ,zenburn-orange)))) - `(zenburn-red ((t (:foreground ,zenburn-red)))) - `(zenburn-green-1 ((t (:foreground ,zenburn-green-1)))) - `(zenburn-green ((t (:foreground ,zenburn-green)))) - `(zenburn-green+1 ((t (:foreground ,zenburn-green+1)))) - `(zenburn-green+2 ((t (:foreground ,zenburn-green+2)))) - `(zenburn-green+3 ((t (:foreground ,zenburn-green+3)))) - `(zenburn-green+4 ((t (:foreground ,zenburn-green+4)))) - `(zenburn-blue ((t (:foreground ,zenburn-blue)))) - `(zenburn-blue-1 ((t (:foreground ,zenburn-blue-1)))) - `(zenburn-blue-2 ((t (:foreground ,zenburn-blue-2)))) - `(zenburn-blue-3 ((t (:foreground ,zenburn-blue-3)))) - `(zenburn-blue-4 ((t (:foreground ,zenburn-blue-4)))) - `(zenburn-magenta ((t (:foreground ,zenburn-magenta)))) - - '(zenburn-title ((t (:inherit variable-pitch :weight bold)))) - - '(font-lock-builtin - ((t (:inherit zenburn-blue)))) - '(font-lock-comment - ((t (:inherit zenburn-green)))) - '(font-lock-comment-delimiter - ((t (:inherit zenburn-lowlight-2)))) - '(font-lock-constant - ((t (:inherit zenburn-primary-4)))) - '(font-lock-doc - ((t (:inherit zenburn-green+1)))) - `(font-lock-function-name - ((t (:foreground ,zenburn-yellow)))) - '(font-lock-keyword - ((t (:inherit zenburn-primary-1)))) - '(font-lock-negation-char - ((t (:inherit zenburn-primary-1)))) - '(font-lock-preprocessor - ((t (:inherit zenburn-blue)))) - '(font-lock-string - ((t (:inherit zenburn-red)))) - '(font-lock-type - ((t (:inherit zenburn-primary-3)))) - `(font-lock-variable-name - ((t (:foreground ,zenburn-yellow)))) - '(font-lock-warning - ((t (:inherit zenburn-highlight-alerting)))) - - '(font-lock-pseudo-keyword - ((t (:inherit zenburn-primary-2)))) - '(font-lock-operator - ((t (:inherit zenburn-primary-3)))) - - '(term-default-bg ((t (nil)))) - '(term-default-bg-inv ((t (nil)))) - '(term-default-fg ((t (nil)))) - '(term-default-fg-inv ((t (nil)))) - '(term-invisible ((t (nil)))) ;; XXX: Security risk? - '(term-invisible-inv ((t (nil)))) - '(term-bold ((t (:weight bold)))) - '(term-underline ((t (:underline t)))) - - ;; XXX: Map these to ansi-term's faces (`term-red', etc.)? - '(zenburn-term-dark-gray ((t (:foreground "#709080")))) - '(zenburn-term-light-blue ((t (:foreground "#94bff3")))) - '(zenburn-term-light-cyan ((t (:foreground "#93e0e3")))) - '(zenburn-term-light-green ((t (:foreground "#c3bf9f")))) - '(zenburn-term-light-magenta ((t (:foreground "#ec93d3")))) - '(zenburn-term-light-red ((t (:foreground "#dca3a3")))) - '(zenburn-term-light-yellow ((t (:foreground "#f0dfaf")))) - '(zenburn-term-white ((t (:foreground "#ffffff")))) - - '(zenburn-term-black ((t (:foreground "#000000")))) - '(zenburn-term-dark-blue ((t (:foreground "#506070")))) - '(zenburn-term-dark-cyan ((t (:foreground "#8cd0d3")))) - '(zenburn-term-dark-green ((t (:foreground "#60b48a")))) - '(zenburn-term-dark-magenta ((t (:foreground "#dc8cc3")))) - '(zenburn-term-dark-red ((t (:foreground "#705050")))) - '(zenburn-term-dark-yellow ((t (:foreground "#dfaf8f")))) - `(zenburn-term-light-gray ((t (:foreground ,zenburn-fg)))) - - '(plain-widget-button - ((t (:weight bold)))) - '(plain-widget-button-pressed - ((t (:inverse-video t)))) - '(plain-widget-documentation - ((t (:inherit font-lock-doc)))) - `(plain-widget-field - ((t (:background ,zenburn-bg+2)))) - '(plain-widget-inactive - ((t (:strike-through t)))) - `(plain-widget-single-line-field - ((t (:background ,zenburn-bg+2)))) - - `(fancy-widget-button - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style released-button))))) - `(fancy-widget-button-pressed - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style pressed-button))))) - `(fancy-widget-button-highlight - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style released-button))))) - `(fancy-widget-button-pressed-highlight - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style pressed-button))))) - '(fancy-widget-documentation - ((t (:inherit font-lock-doc)))) - `(fancy-widget-field - ((t (:background ,zenburn-bg+2)))) - '(fancy-widget-inactive - ((t (:strike-through t)))) - `(fancy-widget-single-line-field - ((t (:background ,zenburn-bg+2)))) - - '(widget-button - ((t (:inherit plain-widget-button)))) - '(widget-button-pressed - ((t (:inherit fancy-widget-button-pressed)))) - '(widget-button-highlight - ((t (:inherit fancy-widget-button-highlight)))) - '(widget-button-pressed-highlight - ((t (:inherit fancy-widget-button-pressed-highlight)))) - '(widget-documentation - ((t (:inherit fancy-widget-documentation)))) - '(widget-field - ((t (:inherit fancy-widget-field)))) - '(widget-inactive - ((t (:inherit fancy-widget-inactive)))) - '(widget-single-line-field - ((t (:inherit fancy-widget-single-line-field)))) - - `(border ((t (:background ,zenburn-bg)))) - '(fringe ((t (:inherit zenburn-highlight-subtle)))) - '(header-line ((t (:inherit zenburn-highlight-damp - :box (:color "#2e3330" :line-width 2))))) - '(mode-line ((t (:foreground "#acbc90" :background "#1e2320" - :box (:color "#1e2320" :line-width 2))))) - '(mode-line-inactive ((t (:background "#2e3330" :foreground "#88b090" - :box (:color "#2e3330" :line-width 2))))) - `(mode-line-buffer-id ((t (:foreground ,zenburn-yellow :weight bold)))) - `(minibuffer-prompt ((t (:foreground ,zenburn-yellow)))) - `(Buffer-menu-buffer ((t (:inherit zenburn-primary-1)))) - - '(region ((t (:foreground "#71d3b4" :background "#233323")))) - `(secondary-selection - ((t (:foreground ,zenburn-fg :background "#506070")))) - - '(trailing-whitespace ((t (:inherit font-lock-warning)))) - '(highlight ((t (:underline t)))) - '(paren ((t (:inherit zenburn-lowlight-1)))) - '(show-paren-mismatch ((t (:inherit font-lock-warning)))) - '(show-paren-match ((t (:inherit font-lock-keyword)))) - '(match ((t (:weight bold)))) - - `(cursor ((t (:background ,zenburn-fg :foreground ,zenburn-bg)))) - '(hover-highlight ((t (:underline t :foreground "#f8f893")))) - '(menu ((t nil))) - '(mouse ((t (:inherit zenburn-foreground)))) - `(scroll-bar ((t (:background ,zenburn-bg+2)))) - `(tool-bar ((t (:background ,zenburn-bg+2)))) - - '(ido-first-match ((t (:inherit zenburn-primary-1)))) - '(ido-only-match ((t (:inherit zenburn-primary-2)))) - `(ido-subdir ((t (:foreground ,zenburn-yellow)))) - - `(isearch ((t (:foreground ,zenburn-fg :background "#506070")))) - `(isearch-lazy-highlight - ((t (:foreground ,zenburn-fg :background "#1e2320" :weight normal)))) - - '(mtorus-highlight ((t (:inherit zenburn-highlight-bluish)))) - '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1)))) - - '(which-func ((t (:inherit mode-line)))) - - '(apt-utils-normal-package - ((t (:inherit zenburn-primary-1)))) - '(apt-utils-virtual-package - ((t (:inherit zenburn-primary-2)))) - '(apt-utils-field-keyword - ((t (:inherit font-lock-doc)))) - '(apt-utils-field-contents - ((t (:inherit font-lock-comment)))) - '(apt-utils-summary - ((t (:inherit bold)))) - '(apt-utils-description - ((t (:inherit default)))) - '(apt-utils-version - ((t (:inherit zenburn-blue)))) - '(apt-utils-broken - ((t (:inherit font-lock-warning)))) - - '(breakpoint-enabled-bitmap ((t (:inherit zenburn-primary-1)))) - '(breakpoint-disabled-bitmap ((t (:inherit font-lock-comment)))) - - '(calendar-today ((t (:underline nil :inherit zenburn-primary-2)))) - '(diary ((t (:underline nil :inherit zenburn-primary-1)))) - '(holiday ((t (:underline t :inherit zenburn-primary-4)))) - - '(bongo-unfilled-seek-bar ((t (:background "#606060")))) - - '(change-log-date ((t (:inherit zenburn-blue)))) - - '(comint-highlight-input ((t (:inherit zenburn-primary-1)))) - '(comint-highlight-prompt ((t (:inherit zenburn-primary-2)))) - - '(compilation-info ((t (:inherit zenburn-primary-1)))) - '(compilation-warning ((t (:inherit font-lock-warning)))) - - '(cua-rectangle ((t (:inherit region)))) - - '(custom-button - ((t (:inherit fancy-widget-button)))) - '(custom-button-pressed - ((t (:inherit fancy-widget-button-pressed)))) - '(custom-changed - ((t (:inherit zenburn-blue)))) - '(custom-comment - ((t (:inherit font-lock-doc)))) - '(custom-comment-tag - ((t (:inherit font-lock-doc)))) - '(custom-documentation - ((t (:inherit font-lock-doc)))) - '(custom-link - ((t (:inherit zenburn-yellow :underline t)))) - '(custom-tag - ((t (:inherit zenburn-primary-2)))) - '(custom-group-tag - ((t (:inherit zenburn-primary-1)))) - '(custom-group-tag-1 - ((t (:inherit zenburn-primary-4)))) - '(custom-invalid - ((t (:inherit font-lock-warning)))) - '(custom-modified - ((t (:inherit zenburn-primary-3)))) - '(custom-rogue - ((t (:inhrit font-lock-warning)))) - '(custom-saved - ((t (:underline t)))) - '(custom-set - ((t (:inverse-video t :inherit zenburn-blue)))) - '(custom-state - ((t (:inherit font-lock-comment)))) - '(custom-variable-button - ((t (:weight bold :underline t)))) - '(custom-variable-tag - ((t (:inherit zenburn-primary-2)))) - - '(dictionary-button ((t (:inherit fancy-widget-button)))) - '(dictionary-reference ((t (:inherit zenburn-primary-1)))) - '(dictionary-word-entry ((t (:inherit font-lock-keyword)))) - - '(diff-header ((t (:inherit zenburn-highlight-subtle)))) - '(diff-index ((t (:inherit bold)))) - '(diff-file-header ((t (:inherit bold)))) - '(diff-hunk-header ((t (:inherit zenburn-highlight-subtle)))) - - '(diff-added ((t (:inherit zenburn-primary-3)))) - '(diff-removed ((t (:inherit zenburn-blue)))) - '(diff-context ((t (:inherit font-lock-comment)))) - '(diff-refine-change ((t (:inherit zenburn-background-2)))) - - `(emms-pbi-song ((t (:foreground ,zenburn-yellow)))) - '(emms-pbi-current ((t (:inherit zenburn-primary-1)))) - '(emms-pbi-mark-marked ((t (:inherit zenburn-primary-2)))) - - '(erc-action ((t (:inherit erc-default)))) - '(erc-bold ((t (:weight bold)))) - '(erc-current-nick ((t (:inherit zenburn-primary-1)))) - '(erc-dangerous-host ((t (:inherit font-lock-warning)))) - `(erc-default ((t (:foreground ,zenburn-fg)))) - '(erc-direct-msg ((t (:inherit erc-default)))) - '(erc-error ((t (:inherit font-lock-warning)))) - '(erc-fool ((t (:inherit zenburn-lowlight-1)))) - '(erc-highlight ((t (:inherit hover-highlight)))) - `(erc-input ((t (:foreground ,zenburn-yellow)))) - '(erc-keyword ((t (:inherit zenburn-primary-1)))) - '(erc-nick-default ((t (:inherit bold)))) - '(erc-nick-msg ((t (:inherit erc-default)))) - '(erc-notice ((t (:inherit zenburn-green)))) - '(erc-pal ((t (:inherit zenburn-primary-3)))) - '(erc-prompt ((t (:inherit zenburn-primary-2)))) - '(erc-timestamp ((t (:inherit zenburn-green+1)))) - '(erc-underline ((t (:inherit underline)))) - - '(circe-highlight-nick-face ((t (:inherit zenburn-primary-1)))) - '(circe-my-message-face ((t (:inherit zenburn-yellow)))) - '(circe-originator-face ((t (:inherit bold)))) - '(circe-prompt-face ((t (:inherit zenburn-primary-1)))) - '(circe-server-face ((t (:inherit font-lock-comment-face)))) - - '(rcirc-my-nick ((t (:inherit zenburn-primary-1)))) - '(rcirc-other-nick ((t (:inherit bold)))) - '(rcirc-bright-nick - ((t (:foreground "white" :inherit rcirc-other-nick)))) - '(rcirc-dim-nick ((t (:inherit font-lock-comment)))) - '(rcirc-nick-in-message ((t (:inherit bold)))) - '(rcirc-server ((t (:inherit font-lock-comment)))) - '(rcirc-server-prefix ((t (:inherit font-lock-comment-delimiter)))) - '(rcirc-timestamp ((t (:inherit font-lock-comment)))) - '(rcirc-prompt ((t (:inherit zenburn-primary-1)))) - '(rcirc-mode-line-nick ((t (:inherit zenburn-primary-1)))) - - '(eshell-prompt ((t (:inherit zenburn-primary-1)))) - '(eshell-ls-archive ((t (:foreground "#c3bf9f" :weight bold)))) - '(eshell-ls-backup ((t (:inherit font-lock-comment)))) - '(eshell-ls-clutter ((t (:inherit font-lock-comment)))) - `(eshell-ls-directory ((t (:foreground ,zenburn-blue+1 :weight bold)))) - `(eshell-ls-executable ((t (:foreground ,zenburn-red+1 :weight bold)))) - '(eshell-ls-unreadable ((t (:inherit zenburn-lowlight-1)))) - '(eshell-ls-missing ((t (:inherit font-lock-warning)))) - '(eshell-ls-product ((t (:inherit font-lock-doc)))) - '(eshell-ls-special ((t (:inherit zenburn-primary-1)))) - `(eshell-ls-symlink ((t (:foreground ,zenburn-cyan :weight bold)))) - - '(elscreen-tab-current-screen - ((t (:inherit zenburn-primary-1)))) - `(elscreen-tab-other-screen - ((t (:foreground ,zenburn-yellow :background ,zenburn-green)))) - - '(flyspell-duplicate ((t (:inherit zenburn-primary-1)))) - '(flyspell-incorrect ((t (:inherit zenburn-primary-2)))) - - '(highlight-current-line ((t (:inherit zenburn-highlight-subtle)))) - - '(ibuffer-deletion ((t (:inherit zenburn-primary-2)))) - '(ibuffer-marked ((t (:inherit zenburn-primary-1)))) - '(ibuffer-special-buffer ((t (:inherit font-lock-doc)))) - '(ibuffer-help-buffer ((t (:inherit font-lock-comment)))) - - '(message-cited-text ((t (:inherit font-lock-comment)))) - '(message-header-name ((t (:inherit zenburn-green+1)))) - '(message-header-other ((t (:inherit zenburn-green)))) - '(message-header-to ((t (:inherit zenburn-primary-1)))) - '(message-header-from ((t (:inherit zenburn-primary-1)))) - '(message-header-cc ((t (:inherit zenburn-primary-1)))) - '(message-header-newsgroups ((t (:inherit zenburn-primary-1)))) - '(message-header-subject ((t (:inherit zenburn-primary-2)))) - '(message-header-xheader ((t (:inherit zenburn-green)))) - '(message-mml ((t (:inherit zenburn-primary-1)))) - '(message-separator ((t (:inherit font-lock-comment)))) - - '(gnus-header-name ((t (:inherit message-header-name)))) - '(gnus-header-content ((t (:inherit message-header-other)))) - '(gnus-header-from ((t (:inherit message-header-from)))) - '(gnus-header-subject ((t (:inherit message-header-subject)))) - '(gnus-header-newsgroups ((t (:inherit message-header-other)))) - - `(gnus-x-face ((t (:background ,zenburn-fg :foreground ,zenburn-bg)))) - - `(gnus-cite-1 ((t (:foreground ,zenburn-blue)))) - `(gnus-cite-2 ((t (:foreground ,zenburn-blue-1)))) - `(gnus-cite-3 ((t (:foreground ,zenburn-blue-2)))) - `(gnus-cite-4 ((t (:foreground ,zenburn-green+2)))) - `(gnus-cite-5 ((t (:foreground ,zenburn-green+1)))) - `(gnus-cite-6 ((t (:foreground ,zenburn-green)))) - `(gnus-cite-7 ((t (:foreground ,zenburn-red)))) - `(gnus-cite-8 ((t (:foreground ,zenburn-red-1)))) - `(gnus-cite-9 ((t (:foreground ,zenburn-red-2)))) - `(gnus-cite-10 ((t (:foreground ,zenburn-yellow-1)))) - `(gnus-cite-11 ((t (:foreground ,zenburn-yellow)))) - - `(gnus-group-news-1-empty ((t (:foreground ,zenburn-yellow)))) - `(gnus-group-news-2-empty ((t (:foreground ,zenburn-green+3)))) - `(gnus-group-news-3-empty ((t (:foreground ,zenburn-green+1)))) - `(gnus-group-news-4-empty ((t (:foreground ,zenburn-blue-2)))) - `(gnus-group-news-5-empty ((t (:foreground ,zenburn-blue-3)))) - `(gnus-group-news-6-empty ((t (:inherit zenburn-lowlight-1)))) - `(gnus-group-news-low-empty ((t (:inherit zenburn-lowlight-1)))) - - '(gnus-group-mail-1-empty ((t (:inherit gnus-group-news-1-empty)))) - '(gnus-group-mail-2-empty ((t (:inherit gnus-group-news-2-empty)))) - '(gnus-group-mail-3-empty ((t (:inherit gnus-group-news-3-empty)))) - '(gnus-group-mail-4-empty ((t (:inherit gnus-group-news-4-empty)))) - '(gnus-group-mail-5-empty ((t (:inherit gnus-group-news-5-empty)))) - '(gnus-group-mail-6-empty ((t (:inherit gnus-group-news-6-empty)))) - '(gnus-group-mail-low-empty ((t (:inherit gnus-group-news-low-empty)))) - - '(gnus-group-news-1 ((t (:bold t :inherit gnus-group-news-1-empty)))) - '(gnus-group-news-2 ((t (:bold t :inherit gnus-group-news-2-empty)))) - '(gnus-group-news-3 ((t (:bold t :inherit gnus-group-news-3-empty)))) - '(gnus-group-news-4 ((t (:bold t :inherit gnus-group-news-4-empty)))) - '(gnus-group-news-5 ((t (:bold t :inherit gnus-group-news-5-empty)))) - '(gnus-group-news-6 ((t (:bold t :inherit gnus-group-news-6-empty)))) - '(gnus-group-news-low ((t (:bold t :inherit gnus-group-news-low-empty)))) - - '(gnus-group-mail-1 ((t (:bold t :inherit gnus-group-mail-1-empty)))) - '(gnus-group-mail-2 ((t (:bold t :inherit gnus-group-mail-2-empty)))) - '(gnus-group-mail-3 ((t (:bold t :inherit gnus-group-mail-3-empty)))) - '(gnus-group-mail-4 ((t (:bold t :inherit gnus-group-mail-4-empty)))) - '(gnus-group-mail-5 ((t (:bold t :inherit gnus-group-mail-5-empty)))) - '(gnus-group-mail-6 ((t (:bold t :inherit gnus-group-mail-6-empty)))) - '(gnus-group-mail-low ((t (:bold t :inherit gnus-group-mail-low-empty)))) - - `(gnus-signature ((t (:foreground ,zenburn-yellow)))) - - '(gnus-summary-selected - ((t (:inherit zenburn-primary-1)))) - '(gnus-summary-cancelled - ((t (:inherit zenburn-highlight-alerting)))) - - '(gnus-summary-low-ticked - ((t (:inherit zenburn-primary-2)))) - '(gnus-summary-normal-ticked - ((t (:inherit zenburn-primary-2)))) - '(gnus-summary-high-ticked - ((t (:inherit zenburn-primary-2)))) - - '(gnus-summary-low-unread - ((t (:inherit zenburn-foreground :weight normal)))) - '(gnus-summary-normal-unread - ((t (:inherit zenburn-foreground :weight normal)))) - '(gnus-summary-high-unread - ((t (:inherit zenburn-foreground :weight bold)))) - - '(gnus-summary-low-read - ((t (:inherit zenburn-green :weight normal)))) - '(gnus-summary-normal-read - ((t (:inherit zenburn-green :weight normal)))) - '(gnus-summary-high-read - ((t (:inherit zenburn-green :weight bold)))) - - '(gnus-summary-low-ancient - ((t (:inherit zenburn-blue :weight normal)))) - '(gnus-summary-normal-ancient - ((t (:inherit zenburn-blue :weight normal)))) - '(gnus-summary-high-ancient - ((t (:inherit zenburn-blue)))) - - '(help-argument-name ((t (:weight bold)))) - - '(imaxima-latex-error ((t (:inherit font-lock-warning)))) - - `(info-xref ((t (:foreground ,zenburn-yellow :weight bold)))) - '(info-xref-visited ((t (:inherit info-xref :weight normal)))) - '(info-header-xref ((t (:inherit info-xref)))) - `(info-menu-star ((t (:foreground ,zenburn-orange :weight bold)))) - `(info-menu-5 ((t (:inherit info-menu-star)))) - '(info-node ((t (:weight bold)))) - '(info-header-node ((t (:weight normal)))) - - '(jabber-roster-user-chatty - ((t (:inherit zenburn-primary-1)))) - '(jabber-roster-user-online - ((t (:inherit zenburn-primary-2)))) - '(jabber-roster-user-away - ((t (:inherit font-lock-doc)))) - '(jabber-roster-user-xa - ((t (:inherit font-lock-comment)))) - '(jabber-roster-user-offline - ((t (:inherit zenburn-lowlight-1)))) - '(jabber-roster-user-dnd - ((t (:inherit zenburn-primary-5)))) - '(jabber-roster-user-error - ((t (:inherit font-lock-warning)))) - - '(jabber-title-small - ((t (:inherit zenburn-title :height 1.2)))) - '(jabber-title-medium - ((t (:inherit jabber-title-small :height 1.2)))) - '(jabber-title-large - ((t (:inherit jabber-title-medium :height 1.2)))) - - '(jabber-chat-prompt-local - ((t (:inherit zenburn-primary-1)))) - '(jabber-chat-prompt-foreign - ((t (:inherit zenburn-primary-2)))) - - '(jabber-rare-time-face - ((t (:inherit zenburn-green+1)))) - - '(jde-java-font-lock-modifier - ((t (:inherit zenburn-primary-2)))) - '(jde-java-font-lock-doc-tag - ((t (:inherit zenburn-primary-1)))) - '(jde-java-font-lock-constant - ((t (:inherit font-lock-constant)))) - '(jde-java-font-lock-package - ((t (:inherit zenburn-primary-3)))) - '(jde-java-font-lock-number - ((t (:inherit font-lock-constant)))) - '(jde-java-font-lock-operator - ((t (:inherit font-lock-keyword)))) - '(jde-java-font-lock-link - ((t (:inherit zenburn-primary-5 :underline t)))) - - '(keywiz-right ((t (:inherit zenburn-primary-1)))) - '(keywiz-wrong ((t (:inherit font-lock-warning)))) - '(keywiz-command ((t (:inherit zenburn-primary-2)))) - - '(font-latex-bold ((t (:inherit bold)))) - '(font-latex-warning ((t (:inherit font-lock-warning)))) - '(font-latex-sedate ((t (:inherit zenburn-primary-1)))) - '(font-latex-title-4 ((t (:inherit zenburn-title)))) - - '(makefile-space ((t (:inherit font-lock-warning)))) - '(makefile-shell ((t (nil)))) - - '(nxml-delimited-data ((t (:inherit font-lock-string)))) - '(nxml-name ((t (:inherit zenburn-primary-1)))) - '(nxml-ref ((t (:inherit zenburn-primary-5)))) - '(nxml-delimiter ((t (:inherit default)))) - '(nxml-text ((t (:inherit default)))) - - '(nxml-comment-content - ((t (:inherit font-lock-comment)))) - '(nxml-comment-delimiter - ((t (:inherit nxml-comment-content)))) - '(nxml-processing-instruction-target - ((t (:inherit zenburn-primary-2)))) - '(nxml-processing-instruction-delimiter - ((t (:inherit nxml-processing-instruction-target)))) - '(nxml-processing-instruction-content - ((t (:inherit nxml-processing-instruction-target)))) - '(nxml-cdata-section-CDATA - ((t (:inherit zenburn-primary-4)))) - '(nxml-cdata-section-delimiter - ((t (:inherit nxml-cdata-section-CDATA)))) - '(nxml-cdata-section-content - ((t (:inherit nxml-text)))) - '(nxml-entity-ref-name - ((t (:inherit zenburn-primary-5)))) - '(nxml-entity-ref-delimiter - ((t (:inherit nxml-entity-ref-name)))) - '(nxml-char-ref-number - ((t (:inherit nxml-entity-ref-name)))) - '(nxml-char-ref-delimiter - ((t (:inherit nxml-entity-ref-delimiter)))) - - '(nxml-tag-delimiter ((t (:inherit default)))) - '(nxml-tag-slash ((t (:inherit default)))) - '(nxml-element-local-name ((t (:inherit zenburn-primary-1)))) - '(nxml-element-prefix ((t (:inherit default)))) - '(nxml-element-colon ((t (:inherit default)))) - - '(nxml-attribute-local-name - ((t (:inherit zenburn-primary-3)))) - '(nxml-namespace-attribute-prefix - ((t (:inherit nxml-attribute-local-name)))) - '(nxml-attribute-value - ((t (:inherit font-lock-string)))) - '(nxml-attribute-value-delimiter - ((t (:inherit nxml-attribute-value)))) - '(nxml-attribute-prefix - ((t (:inherit default)))) - '(nxml-namespace-attribute-xmlns - ((t (:inherit nxml-attribute-prefix)))) - '(nxml-attribute-colon - ((t (:inherit default)))) - '(nxml-namespace-attribute-colon - ((t (:inherit nxml-attribute-colon)))) - - '(org-agenda-date-today - ((t (:foreground "white" :slant italic :weight bold))) t) - '(org-agenda-structure - ((t (:inherit font-lock-comment-face)))) - '(org-archived ((t (:foreground "#8f8f8f")))) - `(org-checkbox ((t (:background ,zenburn-bg+2 :foreground "white" - :box (:line-width 1 :style released-button))))) - `(org-date ((t (:foreground ,zenburn-blue :underline t)))) - `(org-deadline-announce ((t (:foreground ,zenburn-red-1)))) - `(org-done ((t (:bold t :weight bold :foreground ,zenburn-green+3)))) - `(org-formula ((t (:foreground ,zenburn-yellow-2)))) - `(org-headline-done ((t (:foreground ,zenburn-green+3)))) - `(org-hide ((t (:foreground ,zenburn-bg-1)))) - `(org-level-1 ((t (:foreground ,zenburn-orange)))) - `(org-level-2 ((t (:foreground ,zenburn-yellow)))) - `(org-level-3 ((t (:foreground ,zenburn-blue)))) - `(org-level-4 ((t (:foreground ,zenburn-cyan)))) - `(org-level-5 ((t (:foreground ,zenburn-blue-1)))) - `(org-level-6 ((t (:foreground ,zenburn-blue-2)))) - `(org-level-7 ((t (:foreground ,zenburn-blue-3)))) - `(org-level-8 ((t (:foreground ,zenburn-blue-4)))) - `(org-link ((t (:foreground ,zenburn-yellow-2 :underline t)))) - `(org-scheduled ((t (:foreground ,zenburn-green+4)))) - `(org-scheduled-previously ((t (:foreground ,zenburn-red-4)))) - `(org-scheduled-today ((t (:foreground ,zenburn-blue+1)))) - `(org-special-keyword ((t (:foreground ,zenburn-yellow-1)))) - `(org-table ((t (:foreground ,zenburn-green+2)))) - '(org-tag ((t (:bold t :weight bold)))) - `(org-time-grid ((t (:foreground ,zenburn-orange+1)))) - `(org-todo ((t (:bold t :foreground ,zenburn-red :weight bold)))) - '(org-upcoming-deadline ((t (:inherit font-lock-keyword-face)))) - `(org-warning ((t (:bold t :foreground ,zenburn-red :weight bold)))) - - '(outline-8 ((t (:inherit default)))) - '(outline-7 ((t (:inherit outline-8 :height 1.0)))) - '(outline-6 ((t (:inherit outline-7 :height 1.0)))) - '(outline-5 ((t (:inherit outline-6 :height 1.0)))) - '(outline-4 ((t (:inherit outline-5 :height 1.0)))) - '(outline-3 ((t (:inherit outline-4 :height 1.0)))) - '(outline-2 ((t (:inherit outline-3 :height 1.0)))) - '(outline-1 ((t (:inherit outline-2 :height 1.0)))) - - '(setnu-line-number ((t (:inherit zenburn-lowlight-2)))) - - '(speedbar-button ((t (:inherit zenburn-primary-1)))) - '(speedbar-file ((t (:inherit zenburn-primary-2)))) - '(speedbar-directory ((t (:inherit zenburn-primary-5)))) - '(speedbar-tag ((t (:inherit font-lock-function-name)))) - '(speedbar-highlight ((t (:underline t)))) - - '(sr-active-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-alt-marked-dir-face - ((t (:inherit zenburn-highlight-subtle :bold)))) - '(sr-alt-marked-file-face - ((t (:inherit zenburn-highlight-subtle)))) - '(sr-broken-link-face - ((t (:inherit zenburn-primary-1)))) - '(sr-clex-hotchar-face - ((t (:inherit zenburn-primary-1)))) - '(sr-compressed-face - ((t (:inherit zenburn-primary-1)))) - '(sr-directory-face - ((t (:inherit zenburn-blue)))) - '(sr-editing-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-encrypted-face - ((t (:inherit zenburn-orange)))) - '(sr-highlight-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-html-face - ((t (:inherit zenburn-green)))) - '(sr-log-face - ((t (:inherit zenburn-magenta)))) - '(sr-marked-dir-face - ((t (:inherit zenburn-highlight-alerting :bold)))) - '(sr-marked-file-face - ((t (:inherit zenburn-highlight-alerting)))) - '(sr-packaged-face - ((t (:inherit zenburn-primary-1)))) - '(sr-passive-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-symlink-directory-face - ((t (:inherit zenburn-blue)))) - '(sr-symlink-face - ((t (:inherit zenburn-blue-2)))) - '(sr-xml-face - ((t (:inherit zenburn-green-1)))) - - '(strokes-char ((t (:inherit font-lock-keyword)))) - - '(todoo-item-header - ((t (:inherit zenburn-primary-1)))) - '(todoo-item-assigned-header - ((t (:inherit zenburn-primary-2)))) - `(todoo-sub-item-header - ((t (:foreground ,zenburn-yellow)))) - - '(tuareg-font-lock-governing - ((t (:inherit zenburn-primary-2)))) - '(tuareg-font-lock-interactive-error - ((t (:inherit font-lock-warning)))) - '(tuareg-font-lock-interactive-output - ((t (:inherit zenburn-primary-3)))) - '(tuareg-font-lock-operator - ((t (:inherit font-lock-operator)))) - - '(w3m-form-button - ((t (:inherit widget-button)))) - '(w3m-form-button-pressed - ((t (:inherit widget-button-pressed)))) - '(w3m-form-button-mouse - ((t (:inherit widget-button-pressed)))) - '(w3m-tab-unselected - ((t (:box (:line-width 1 :style released-button))))) - '(w3m-tab-selected - ((t (:box (:line-width 1 :style pressed-button))))) - '(w3m-tab-unselected-retrieving - ((t (:inherit (w3m-tab-unselected widget-inactive))))) - '(w3m-tab-selected-retrieving - ((t (:inherit (w3m-tab-selected widget-inactive))))) - '(w3m-tab-background - ((t (:inherit zenburn-highlight-subtle)))) - '(w3m-anchor - ((t (:inherit zenburn-primary-1)))) - '(w3m-arrived-anchor - ((t (:inherit zenburn-primary-2)))) - '(w3m-image - ((t (:inherit zenburn-primary-4)))) - '(w3m-form - ((t (:inherit widget-field))))) + `(default ((t (:background ,zenburn-bg :foreground ,zenburn-fg)))) + + '(bold ((t (:weight bold)))) + '(bold-italic ((t (:italic t :weight bold)))) + + '(fixed-pitch ((t (:weight bold)))) + '(italic ((t (:slant italic)))) + '(underline ((t (:underline t)))) + + `(zenburn-background-1 ((t (:background ,zenburn-bg+1)))) + `(zenburn-background-2 ((t (:background ,zenburn-bg+2)))) + + `(zenburn-primary-1 ((t (:foreground ,zenburn-yellow :weight bold)))) + `(zenburn-primary-2 ((t (:foreground ,zenburn-orange :weight bold)))) + '(zenburn-primary-3 ((t (:foreground "#dfdfbf" :weight bold)))) + '(zenburn-primary-4 ((t (:foreground "#dca3a3" :weight bold)))) + '(zenburn-primary-5 ((t (:foreground "#94bff3" :weight bold)))) + + '(zenburn-highlight-damp + ((t (:foreground "#88b090" :background "#2e3330")))) + `(zenburn-highlight-alerting + ((t (:foreground ,zenburn-fg :background "#332323")))) + '(zenburn-highlight-subtle + ((t (:background "#464646")))) + + '(zenburn-lowlight-1 ((t (:foreground "#606060")))) + '(zenburn-lowlight-2 ((t (:foreground "#708070")))) + + `(zenburn-yellow ((t (:foreground ,zenburn-yellow)))) + `(zenburn-orange ((t (:foreground ,zenburn-orange)))) + `(zenburn-red ((t (:foreground ,zenburn-red)))) + `(zenburn-green-1 ((t (:foreground ,zenburn-green-1)))) + `(zenburn-green ((t (:foreground ,zenburn-green)))) + `(zenburn-green+1 ((t (:foreground ,zenburn-green+1)))) + `(zenburn-green+2 ((t (:foreground ,zenburn-green+2)))) + `(zenburn-green+3 ((t (:foreground ,zenburn-green+3)))) + `(zenburn-green+4 ((t (:foreground ,zenburn-green+4)))) + `(zenburn-blue ((t (:foreground ,zenburn-blue)))) + `(zenburn-blue-1 ((t (:foreground ,zenburn-blue-1)))) + `(zenburn-blue-2 ((t (:foreground ,zenburn-blue-2)))) + `(zenburn-blue-3 ((t (:foreground ,zenburn-blue-3)))) + `(zenburn-blue-4 ((t (:foreground ,zenburn-blue-4)))) + `(zenburn-magenta ((t (:foreground ,zenburn-magenta)))) + + '(zenburn-title ((t (:inherit variable-pitch :weight bold)))) + + '(font-lock-builtin + ((t (:inherit zenburn-blue)))) + '(font-lock-comment + ((t (:inherit zenburn-green)))) + '(font-lock-comment-delimiter + ((t (:inherit zenburn-lowlight-2)))) + '(font-lock-constant + ((t (:inherit zenburn-primary-4)))) + '(font-lock-doc + ((t (:inherit zenburn-green+1)))) + `(font-lock-function-name + ((t (:foreground ,zenburn-yellow)))) + '(font-lock-keyword + ((t (:inherit zenburn-primary-1)))) + '(font-lock-negation-char + ((t (:inherit zenburn-primary-1)))) + '(font-lock-preprocessor + ((t (:inherit zenburn-blue)))) + '(font-lock-string + ((t (:inherit zenburn-red)))) + '(font-lock-type + ((t (:inherit zenburn-primary-3)))) + `(font-lock-variable-name + ((t (:foreground ,zenburn-yellow)))) + '(font-lock-warning + ((t (:inherit zenburn-highlight-alerting)))) + + '(font-lock-pseudo-keyword + ((t (:inherit zenburn-primary-2)))) + '(font-lock-operator + ((t (:inherit zenburn-primary-3)))) + + '(term-default-bg ((t (nil)))) + '(term-default-bg-inv ((t (nil)))) + '(term-default-fg ((t (nil)))) + '(term-default-fg-inv ((t (nil)))) + '(term-invisible ((t (nil)))) ;; XXX: Security risk? + '(term-invisible-inv ((t (nil)))) + '(term-bold ((t (:weight bold)))) + '(term-underline ((t (:underline t)))) + + ;; XXX: Map these to ansi-term's faces (`term-red', etc.)? + '(zenburn-term-dark-gray ((t (:foreground "#709080")))) + '(zenburn-term-light-blue ((t (:foreground "#94bff3")))) + '(zenburn-term-light-cyan ((t (:foreground "#93e0e3")))) + '(zenburn-term-light-green ((t (:foreground "#c3bf9f")))) + '(zenburn-term-light-magenta ((t (:foreground "#ec93d3")))) + '(zenburn-term-light-red ((t (:foreground "#dca3a3")))) + '(zenburn-term-light-yellow ((t (:foreground "#f0dfaf")))) + '(zenburn-term-white ((t (:foreground "#ffffff")))) + + '(zenburn-term-black ((t (:foreground "#000000")))) + '(zenburn-term-dark-blue ((t (:foreground "#506070")))) + '(zenburn-term-dark-cyan ((t (:foreground "#8cd0d3")))) + '(zenburn-term-dark-green ((t (:foreground "#60b48a")))) + '(zenburn-term-dark-magenta ((t (:foreground "#dc8cc3")))) + '(zenburn-term-dark-red ((t (:foreground "#705050")))) + '(zenburn-term-dark-yellow ((t (:foreground "#dfaf8f")))) + `(zenburn-term-light-gray ((t (:foreground ,zenburn-fg)))) + + '(plain-widget-button + ((t (:weight bold)))) + '(plain-widget-button-pressed + ((t (:inverse-video t)))) + '(plain-widget-documentation + ((t (:inherit font-lock-doc)))) + `(plain-widget-field + ((t (:background ,zenburn-bg+2)))) + '(plain-widget-inactive + ((t (:strike-through t)))) + `(plain-widget-single-line-field + ((t (:background ,zenburn-bg+2)))) + + `(fancy-widget-button + ((t (:background ,zenburn-bg+1 + :box (:line-width 2 :style released-button))))) + `(fancy-widget-button-pressed + ((t (:background ,zenburn-bg+1 + :box (:line-width 2 :style pressed-button))))) + `(fancy-widget-button-highlight + ((t (:background ,zenburn-bg+1 + :box (:line-width 2 :style released-button))))) + `(fancy-widget-button-pressed-highlight + ((t (:background ,zenburn-bg+1 + :box (:line-width 2 :style pressed-button))))) + '(fancy-widget-documentation + ((t (:inherit font-lock-doc)))) + `(fancy-widget-field + ((t (:background ,zenburn-bg+2)))) + '(fancy-widget-inactive + ((t (:strike-through t)))) + `(fancy-widget-single-line-field + ((t (:background ,zenburn-bg+2)))) + + '(widget-button + ((t (:inherit plain-widget-button)))) + '(widget-button-pressed + ((t (:inherit fancy-widget-button-pressed)))) + '(widget-button-highlight + ((t (:inherit fancy-widget-button-highlight)))) + '(widget-button-pressed-highlight + ((t (:inherit fancy-widget-button-pressed-highlight)))) + '(widget-documentation + ((t (:inherit fancy-widget-documentation)))) + '(widget-field + ((t (:inherit fancy-widget-field)))) + '(widget-inactive + ((t (:inherit fancy-widget-inactive)))) + '(widget-single-line-field + ((t (:inherit fancy-widget-single-line-field)))) + + `(border ((t (:background ,zenburn-bg)))) + '(fringe ((t (:inherit zenburn-highlight-subtle)))) + '(header-line ((t (:inherit zenburn-highlight-damp + :box (:color "#2e3330" :line-width 2))))) + '(mode-line ((t (:foreground "#acbc90" :background "#1e2320" + :box (:color "#1e2320" :line-width 2))))) + '(mode-line-inactive ((t (:background "#2e3330" :foreground "#88b090" + :box (:color "#2e3330" :line-width 2))))) + `(mode-line-buffer-id ((t (:foreground ,zenburn-yellow :weight bold)))) + `(minibuffer-prompt ((t (:foreground ,zenburn-yellow)))) + `(Buffer-menu-buffer ((t (:inherit zenburn-primary-1)))) + + '(region ((t (:foreground "#71d3b4" :background "#233323")))) + `(secondary-selection + ((t (:foreground ,zenburn-fg :background "#506070")))) + + '(trailing-whitespace ((t (:inherit font-lock-warning)))) + '(highlight ((t (:underline t)))) + '(paren ((t (:inherit zenburn-lowlight-1)))) + '(show-paren-mismatch ((t (:inherit font-lock-warning)))) + '(show-paren-match ((t (:inherit font-lock-keyword)))) + '(match ((t (:weight bold)))) + + `(cursor ((t (:background ,zenburn-fg :foreground ,zenburn-bg)))) + '(hover-highlight ((t (:underline t :foreground "#f8f893")))) + '(menu ((t nil))) + '(mouse ((t (:inherit zenburn-foreground)))) + `(scroll-bar ((t (:background ,zenburn-bg+2)))) + `(tool-bar ((t (:background ,zenburn-bg+2)))) + + '(ido-first-match ((t (:inherit zenburn-primary-1)))) + '(ido-only-match ((t (:inherit zenburn-primary-2)))) + `(ido-subdir ((t (:foreground ,zenburn-yellow)))) + + `(isearch ((t (:foreground ,zenburn-fg :background "#506070")))) + `(isearch-lazy-highlight + ((t (:foreground ,zenburn-fg :background "#1e2320" :weight normal)))) + + '(mtorus-highlight ((t (:inherit zenburn-highlight-bluish)))) + '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1)))) + + '(which-func ((t (:inherit mode-line)))) + + '(apt-utils-normal-package + ((t (:inherit zenburn-primary-1)))) + '(apt-utils-virtual-package + ((t (:inherit zenburn-primary-2)))) + '(apt-utils-field-keyword + ((t (:inherit font-lock-doc)))) + '(apt-utils-field-contents + ((t (:inherit font-lock-comment)))) + '(apt-utils-summary + ((t (:inherit bold)))) + '(apt-utils-description + ((t (:inherit default)))) + '(apt-utils-version + ((t (:inherit zenburn-blue)))) + '(apt-utils-broken + ((t (:inherit font-lock-warning)))) + + '(breakpoint-enabled-bitmap ((t (:inherit zenburn-primary-1)))) + '(breakpoint-disabled-bitmap ((t (:inherit font-lock-comment)))) + + '(calendar-today ((t (:underline nil :inherit zenburn-primary-2)))) + '(diary ((t (:underline nil :inherit zenburn-primary-1)))) + '(holiday ((t (:underline t :inherit zenburn-primary-4)))) + + '(bongo-unfilled-seek-bar ((t (:background "#606060")))) + + '(change-log-date ((t (:inherit zenburn-blue)))) + + '(comint-highlight-input ((t (:inherit zenburn-primary-1)))) + '(comint-highlight-prompt ((t (:inherit zenburn-primary-2)))) + + '(compilation-info ((t (:inherit zenburn-primary-1)))) + '(compilation-warning ((t (:inherit font-lock-warning)))) + + '(cua-rectangle ((t (:inherit region)))) + + '(custom-button + ((t (:inherit fancy-widget-button)))) + '(custom-button-pressed + ((t (:inherit fancy-widget-button-pressed)))) + '(custom-changed + ((t (:inherit zenburn-blue)))) + '(custom-comment + ((t (:inherit font-lock-doc)))) + '(custom-comment-tag + ((t (:inherit font-lock-doc)))) + '(custom-documentation + ((t (:inherit font-lock-doc)))) + '(custom-link + ((t (:inherit zenburn-yellow :underline t)))) + '(custom-tag + ((t (:inherit zenburn-primary-2)))) + '(custom-group-tag + ((t (:inherit zenburn-primary-1)))) + '(custom-group-tag-1 + ((t (:inherit zenburn-primary-4)))) + '(custom-invalid + ((t (:inherit font-lock-warning)))) + '(custom-modified + ((t (:inherit zenburn-primary-3)))) + '(custom-rogue + ((t (:inhrit font-lock-warning)))) + '(custom-saved + ((t (:underline t)))) + '(custom-set + ((t (:inverse-video t :inherit zenburn-blue)))) + '(custom-state + ((t (:inherit font-lock-comment)))) + '(custom-variable-button + ((t (:weight bold :underline t)))) + '(custom-variable-tag + ((t (:inherit zenburn-primary-2)))) + + '(dictionary-button ((t (:inherit fancy-widget-button)))) + '(dictionary-reference ((t (:inherit zenburn-primary-1)))) + '(dictionary-word-entry ((t (:inherit font-lock-keyword)))) + + '(diff-header ((t (:inherit zenburn-highlight-subtle)))) + '(diff-index ((t (:inherit bold)))) + '(diff-file-header ((t (:inherit bold)))) + '(diff-hunk-header ((t (:inherit zenburn-highlight-subtle)))) + + '(diff-added ((t (:inherit zenburn-primary-3)))) + '(diff-removed ((t (:inherit zenburn-blue)))) + '(diff-context ((t (:inherit font-lock-comment)))) + '(diff-refine-change ((t (:inherit zenburn-background-2)))) + + `(emms-pbi-song ((t (:foreground ,zenburn-yellow)))) + '(emms-pbi-current ((t (:inherit zenburn-primary-1)))) + '(emms-pbi-mark-marked ((t (:inherit zenburn-primary-2)))) + + '(erc-action ((t (:inherit erc-default)))) + '(erc-bold ((t (:weight bold)))) + '(erc-current-nick ((t (:inherit zenburn-primary-1)))) + '(erc-dangerous-host ((t (:inherit font-lock-warning)))) + `(erc-default ((t (:foreground ,zenburn-fg)))) + '(erc-direct-msg ((t (:inherit erc-default)))) + '(erc-error ((t (:inherit font-lock-warning)))) + '(erc-fool ((t (:inherit zenburn-lowlight-1)))) + '(erc-highlight ((t (:inherit hover-highlight)))) + `(erc-input ((t (:foreground ,zenburn-yellow)))) + '(erc-keyword ((t (:inherit zenburn-primary-1)))) + '(erc-nick-default ((t (:inherit bold)))) + '(erc-nick-msg ((t (:inherit erc-default)))) + '(erc-notice ((t (:inherit zenburn-green)))) + '(erc-pal ((t (:inherit zenburn-primary-3)))) + '(erc-prompt ((t (:inherit zenburn-primary-2)))) + '(erc-timestamp ((t (:inherit zenburn-green+1)))) + '(erc-underline ((t (:inherit underline)))) + + '(circe-highlight-nick-face ((t (:inherit zenburn-primary-1)))) + '(circe-my-message-face ((t (:inherit zenburn-yellow)))) + '(circe-originator-face ((t (:inherit bold)))) + '(circe-prompt-face ((t (:inherit zenburn-primary-1)))) + '(circe-server-face ((t (:inherit font-lock-comment-face)))) + + '(rcirc-my-nick ((t (:inherit zenburn-primary-1)))) + '(rcirc-other-nick ((t (:inherit bold)))) + '(rcirc-bright-nick + ((t (:foreground "white" :inherit rcirc-other-nick)))) + '(rcirc-dim-nick ((t (:inherit font-lock-comment)))) + '(rcirc-nick-in-message ((t (:inherit bold)))) + '(rcirc-server ((t (:inherit font-lock-comment)))) + '(rcirc-server-prefix ((t (:inherit font-lock-comment-delimiter)))) + '(rcirc-timestamp ((t (:inherit font-lock-comment)))) + '(rcirc-prompt ((t (:inherit zenburn-primary-1)))) + '(rcirc-mode-line-nick ((t (:inherit zenburn-primary-1)))) + + '(eshell-prompt ((t (:inherit zenburn-primary-1)))) + '(eshell-ls-archive ((t (:foreground "#c3bf9f" :weight bold)))) + '(eshell-ls-backup ((t (:inherit font-lock-comment)))) + '(eshell-ls-clutter ((t (:inherit font-lock-comment)))) + `(eshell-ls-directory ((t (:foreground ,zenburn-blue+1 :weight bold)))) + `(eshell-ls-executable ((t (:foreground ,zenburn-red+1 :weight bold)))) + '(eshell-ls-unreadable ((t (:inherit zenburn-lowlight-1)))) + '(eshell-ls-missing ((t (:inherit font-lock-warning)))) + '(eshell-ls-product ((t (:inherit font-lock-doc)))) + '(eshell-ls-special ((t (:inherit zenburn-primary-1)))) + `(eshell-ls-symlink ((t (:foreground ,zenburn-cyan :weight bold)))) + + '(elscreen-tab-current-screen + ((t (:inherit zenburn-primary-1)))) + `(elscreen-tab-other-screen + ((t (:foreground ,zenburn-yellow :background ,zenburn-green)))) + + '(flyspell-duplicate ((t (:inherit zenburn-primary-1)))) + '(flyspell-incorrect ((t (:inherit zenburn-primary-2)))) + + '(highlight-current-line ((t (:inherit zenburn-highlight-subtle)))) + + '(ibuffer-deletion ((t (:inherit zenburn-primary-2)))) + '(ibuffer-marked ((t (:inherit zenburn-primary-1)))) + '(ibuffer-special-buffer ((t (:inherit font-lock-doc)))) + '(ibuffer-help-buffer ((t (:inherit font-lock-comment)))) + + '(message-cited-text ((t (:inherit font-lock-comment)))) + '(message-header-name ((t (:inherit zenburn-green+1)))) + '(message-header-other ((t (:inherit zenburn-green)))) + '(message-header-to ((t (:inherit zenburn-primary-1)))) + '(message-header-from ((t (:inherit zenburn-primary-1)))) + '(message-header-cc ((t (:inherit zenburn-primary-1)))) + '(message-header-newsgroups ((t (:inherit zenburn-primary-1)))) + '(message-header-subject ((t (:inherit zenburn-primary-2)))) + '(message-header-xheader ((t (:inherit zenburn-green)))) + '(message-mml ((t (:inherit zenburn-primary-1)))) + '(message-separator ((t (:inherit font-lock-comment)))) + + '(gnus-header-name ((t (:inherit message-header-name)))) + '(gnus-header-content ((t (:inherit message-header-other)))) + '(gnus-header-from ((t (:inherit message-header-from)))) + '(gnus-header-subject ((t (:inherit message-header-subject)))) + '(gnus-header-newsgroups ((t (:inherit message-header-other)))) + + `(gnus-x-face ((t (:background ,zenburn-fg :foreground ,zenburn-bg)))) + + `(gnus-cite-1 ((t (:foreground ,zenburn-blue)))) + `(gnus-cite-2 ((t (:foreground ,zenburn-blue-1)))) + `(gnus-cite-3 ((t (:foreground ,zenburn-blue-2)))) + `(gnus-cite-4 ((t (:foreground ,zenburn-green+2)))) + `(gnus-cite-5 ((t (:foreground ,zenburn-green+1)))) + `(gnus-cite-6 ((t (:foreground ,zenburn-green)))) + `(gnus-cite-7 ((t (:foreground ,zenburn-red)))) + `(gnus-cite-8 ((t (:foreground ,zenburn-red-1)))) + `(gnus-cite-9 ((t (:foreground ,zenburn-red-2)))) + `(gnus-cite-10 ((t (:foreground ,zenburn-yellow-1)))) + `(gnus-cite-11 ((t (:foreground ,zenburn-yellow)))) + + `(gnus-group-news-1-empty ((t (:foreground ,zenburn-yellow)))) + `(gnus-group-news-2-empty ((t (:foreground ,zenburn-green+3)))) + `(gnus-group-news-3-empty ((t (:foreground ,zenburn-green+1)))) + `(gnus-group-news-4-empty ((t (:foreground ,zenburn-blue-2)))) + `(gnus-group-news-5-empty ((t (:foreground ,zenburn-blue-3)))) + `(gnus-group-news-6-empty ((t (:inherit zenburn-lowlight-1)))) + `(gnus-group-news-low-empty ((t (:inherit zenburn-lowlight-1)))) + + '(gnus-group-mail-1-empty ((t (:inherit gnus-group-news-1-empty)))) + '(gnus-group-mail-2-empty ((t (:inherit gnus-group-news-2-empty)))) + '(gnus-group-mail-3-empty ((t (:inherit gnus-group-news-3-empty)))) + '(gnus-group-mail-4-empty ((t (:inherit gnus-group-news-4-empty)))) + '(gnus-group-mail-5-empty ((t (:inherit gnus-group-news-5-empty)))) + '(gnus-group-mail-6-empty ((t (:inherit gnus-group-news-6-empty)))) + '(gnus-group-mail-low-empty ((t (:inherit gnus-group-news-low-empty)))) + + '(gnus-group-news-1 ((t (:bold t :inherit gnus-group-news-1-empty)))) + '(gnus-group-news-2 ((t (:bold t :inherit gnus-group-news-2-empty)))) + '(gnus-group-news-3 ((t (:bold t :inherit gnus-group-news-3-empty)))) + '(gnus-group-news-4 ((t (:bold t :inherit gnus-group-news-4-empty)))) + '(gnus-group-news-5 ((t (:bold t :inherit gnus-group-news-5-empty)))) + '(gnus-group-news-6 ((t (:bold t :inherit gnus-group-news-6-empty)))) + '(gnus-group-news-low ((t (:bold t :inherit gnus-group-news-low-empty)))) + + '(gnus-group-mail-1 ((t (:bold t :inherit gnus-group-mail-1-empty)))) + '(gnus-group-mail-2 ((t (:bold t :inherit gnus-group-mail-2-empty)))) + '(gnus-group-mail-3 ((t (:bold t :inherit gnus-group-mail-3-empty)))) + '(gnus-group-mail-4 ((t (:bold t :inherit gnus-group-mail-4-empty)))) + '(gnus-group-mail-5 ((t (:bold t :inherit gnus-group-mail-5-empty)))) + '(gnus-group-mail-6 ((t (:bold t :inherit gnus-group-mail-6-empty)))) + '(gnus-group-mail-low ((t (:bold t :inherit gnus-group-mail-low-empty)))) + + `(gnus-signature ((t (:foreground ,zenburn-yellow)))) + + '(gnus-summary-selected + ((t (:inherit zenburn-primary-1)))) + '(gnus-summary-cancelled + ((t (:inherit zenburn-highlight-alerting)))) + + '(gnus-summary-low-ticked + ((t (:inherit zenburn-primary-2)))) + '(gnus-summary-normal-ticked + ((t (:inherit zenburn-primary-2)))) + '(gnus-summary-high-ticked + ((t (:inherit zenburn-primary-2)))) + + '(gnus-summary-low-unread + ((t (:inherit zenburn-foreground :weight normal)))) + '(gnus-summary-normal-unread + ((t (:inherit zenburn-foreground :weight normal)))) + '(gnus-summary-high-unread + ((t (:inherit zenburn-foreground :weight bold)))) + + '(gnus-summary-low-read + ((t (:inherit zenburn-green :weight normal)))) + '(gnus-summary-normal-read + ((t (:inherit zenburn-green :weight normal)))) + '(gnus-summary-high-read + ((t (:inherit zenburn-green :weight bold)))) + + '(gnus-summary-low-ancient + ((t (:inherit zenburn-blue :weight normal)))) + '(gnus-summary-normal-ancient + ((t (:inherit zenburn-blue :weight normal)))) + '(gnus-summary-high-ancient + ((t (:inherit zenburn-blue)))) + + '(help-argument-name ((t (:weight bold)))) + + '(imaxima-latex-error ((t (:inherit font-lock-warning)))) + + `(info-xref ((t (:foreground ,zenburn-yellow :weight bold)))) + '(info-xref-visited ((t (:inherit info-xref :weight normal)))) + '(info-header-xref ((t (:inherit info-xref)))) + `(info-menu-star ((t (:foreground ,zenburn-orange :weight bold)))) + `(info-menu-5 ((t (:inherit info-menu-star)))) + '(info-node ((t (:weight bold)))) + '(info-header-node ((t (:weight normal)))) + + '(jabber-roster-user-chatty + ((t (:inherit zenburn-primary-1)))) + '(jabber-roster-user-online + ((t (:inherit zenburn-primary-2)))) + '(jabber-roster-user-away + ((t (:inherit font-lock-doc)))) + '(jabber-roster-user-xa + ((t (:inherit font-lock-comment)))) + '(jabber-roster-user-offline + ((t (:inherit zenburn-lowlight-1)))) + '(jabber-roster-user-dnd + ((t (:inherit zenburn-primary-5)))) + '(jabber-roster-user-error + ((t (:inherit font-lock-warning)))) + + '(jabber-title-small + ((t (:inherit zenburn-title :height 1.2)))) + '(jabber-title-medium + ((t (:inherit jabber-title-small :height 1.2)))) + '(jabber-title-large + ((t (:inherit jabber-title-medium :height 1.2)))) + + '(jabber-chat-prompt-local + ((t (:inherit zenburn-primary-1)))) + '(jabber-chat-prompt-foreign + ((t (:inherit zenburn-primary-2)))) + + '(jabber-rare-time-face + ((t (:inherit zenburn-green+1)))) + + '(jde-java-font-lock-modifier + ((t (:inherit zenburn-primary-2)))) + '(jde-java-font-lock-doc-tag + ((t (:inherit zenburn-primary-1)))) + '(jde-java-font-lock-constant + ((t (:inherit font-lock-constant)))) + '(jde-java-font-lock-package + ((t (:inherit zenburn-primary-3)))) + '(jde-java-font-lock-number + ((t (:inherit font-lock-constant)))) + '(jde-java-font-lock-operator + ((t (:inherit font-lock-keyword)))) + '(jde-java-font-lock-link + ((t (:inherit zenburn-primary-5 :underline t)))) + + '(keywiz-right ((t (:inherit zenburn-primary-1)))) + '(keywiz-wrong ((t (:inherit font-lock-warning)))) + '(keywiz-command ((t (:inherit zenburn-primary-2)))) + + '(font-latex-bold ((t (:inherit bold)))) + '(font-latex-warning ((t (:inherit font-lock-warning)))) + '(font-latex-sedate ((t (:inherit zenburn-primary-1)))) + '(font-latex-title-4 ((t (:inherit zenburn-title)))) + + '(makefile-space ((t (:inherit font-lock-warning)))) + '(makefile-shell ((t (nil)))) + + '(nxml-delimited-data ((t (:inherit font-lock-string)))) + '(nxml-name ((t (:inherit zenburn-primary-1)))) + '(nxml-ref ((t (:inherit zenburn-primary-5)))) + '(nxml-delimiter ((t (:inherit default)))) + '(nxml-text ((t (:inherit default)))) + + '(nxml-comment-content + ((t (:inherit font-lock-comment)))) + '(nxml-comment-delimiter + ((t (:inherit nxml-comment-content)))) + '(nxml-processing-instruction-target + ((t (:inherit zenburn-primary-2)))) + '(nxml-processing-instruction-delimiter + ((t (:inherit nxml-processing-instruction-target)))) + '(nxml-processing-instruction-content + ((t (:inherit nxml-processing-instruction-target)))) + '(nxml-cdata-section-CDATA + ((t (:inherit zenburn-primary-4)))) + '(nxml-cdata-section-delimiter + ((t (:inherit nxml-cdata-section-CDATA)))) + '(nxml-cdata-section-content + ((t (:inherit nxml-text)))) + '(nxml-entity-ref-name + ((t (:inherit zenburn-primary-5)))) + '(nxml-entity-ref-delimiter + ((t (:inherit nxml-entity-ref-name)))) + '(nxml-char-ref-number + ((t (:inherit nxml-entity-ref-name)))) + '(nxml-char-ref-delimiter + ((t (:inherit nxml-entity-ref-delimiter)))) + + '(nxml-tag-delimiter ((t (:inherit default)))) + '(nxml-tag-slash ((t (:inherit default)))) + '(nxml-element-local-name ((t (:inherit zenburn-primary-1)))) + '(nxml-element-prefix ((t (:inherit default)))) + '(nxml-element-colon ((t (:inherit default)))) + + '(nxml-attribute-local-name + ((t (:inherit zenburn-primary-3)))) + '(nxml-namespace-attribute-prefix + ((t (:inherit nxml-attribute-local-name)))) + '(nxml-attribute-value + ((t (:inherit font-lock-string)))) + '(nxml-attribute-value-delimiter + ((t (:inherit nxml-attribute-value)))) + '(nxml-attribute-prefix + ((t (:inherit default)))) + '(nxml-namespace-attribute-xmlns + ((t (:inherit nxml-attribute-prefix)))) + '(nxml-attribute-colon + ((t (:inherit default)))) + '(nxml-namespace-attribute-colon + ((t (:inherit nxml-attribute-colon)))) + + '(org-agenda-date-today + ((t (:foreground "white" :slant italic :weight bold))) t) + '(org-agenda-structure + ((t (:inherit font-lock-comment-face)))) + '(org-archived ((t (:foreground "#8f8f8f")))) + `(org-checkbox ((t (:background ,zenburn-bg+2 :foreground "white" + :box (:line-width 1 :style released-button))))) + `(org-date ((t (:foreground ,zenburn-blue :underline t)))) + `(org-deadline-announce ((t (:foreground ,zenburn-red-1)))) + `(org-done ((t (:bold t :weight bold :foreground ,zenburn-green+3)))) + `(org-formula ((t (:foreground ,zenburn-yellow-2)))) + `(org-headline-done ((t (:foreground ,zenburn-green+3)))) + `(org-hide ((t (:foreground ,zenburn-bg-1)))) + `(org-level-1 ((t (:foreground ,zenburn-orange)))) + `(org-level-2 ((t (:foreground ,zenburn-yellow)))) + `(org-level-3 ((t (:foreground ,zenburn-blue)))) + `(org-level-4 ((t (:foreground ,zenburn-cyan)))) + `(org-level-5 ((t (:foreground ,zenburn-blue-1)))) + `(org-level-6 ((t (:foreground ,zenburn-blue-2)))) + `(org-level-7 ((t (:foreground ,zenburn-blue-3)))) + `(org-level-8 ((t (:foreground ,zenburn-blue-4)))) + `(org-link ((t (:foreground ,zenburn-yellow-2 :underline t)))) + `(org-scheduled ((t (:foreground ,zenburn-green+4)))) + `(org-scheduled-previously ((t (:foreground ,zenburn-red-4)))) + `(org-scheduled-today ((t (:foreground ,zenburn-blue+1)))) + `(org-special-keyword ((t (:foreground ,zenburn-yellow-1)))) + `(org-table ((t (:foreground ,zenburn-green+2)))) + '(org-tag ((t (:bold t :weight bold)))) + `(org-time-grid ((t (:foreground ,zenburn-orange+1)))) + `(org-todo ((t (:bold t :foreground ,zenburn-red :weight bold)))) + '(org-upcoming-deadline ((t (:inherit font-lock-keyword-face)))) + `(org-warning ((t (:bold t :foreground ,zenburn-red :weight bold)))) + + '(outline-8 ((t (:inherit default)))) + '(outline-7 ((t (:inherit outline-8 :height 1.0)))) + '(outline-6 ((t (:inherit outline-7 :height 1.0)))) + '(outline-5 ((t (:inherit outline-6 :height 1.0)))) + '(outline-4 ((t (:inherit outline-5 :height 1.0)))) + '(outline-3 ((t (:inherit outline-4 :height 1.0)))) + '(outline-2 ((t (:inherit outline-3 :height 1.0)))) + '(outline-1 ((t (:inherit outline-2 :height 1.0)))) + + '(setnu-line-number ((t (:inherit zenburn-lowlight-2)))) + + '(speedbar-button ((t (:inherit zenburn-primary-1)))) + '(speedbar-file ((t (:inherit zenburn-primary-2)))) + '(speedbar-directory ((t (:inherit zenburn-primary-5)))) + '(speedbar-tag ((t (:inherit font-lock-function-name)))) + '(speedbar-highlight ((t (:underline t)))) + + '(sr-active-path-face + ((t (:inherit zenburn-primary-1)))) + '(sr-alt-marked-dir-face + ((t (:inherit zenburn-highlight-subtle :bold)))) + '(sr-alt-marked-file-face + ((t (:inherit zenburn-highlight-subtle)))) + '(sr-broken-link-face + ((t (:inherit zenburn-primary-1)))) + '(sr-clex-hotchar-face + ((t (:inherit zenburn-primary-1)))) + '(sr-compressed-face + ((t (:inherit zenburn-primary-1)))) + '(sr-directory-face + ((t (:inherit zenburn-blue)))) + '(sr-editing-path-face + ((t (:inherit zenburn-primary-1)))) + '(sr-encrypted-face + ((t (:inherit zenburn-orange)))) + '(sr-highlight-path-face + ((t (:inherit zenburn-primary-1)))) + '(sr-html-face + ((t (:inherit zenburn-green)))) + '(sr-log-face + ((t (:inherit zenburn-magenta)))) + '(sr-marked-dir-face + ((t (:inherit zenburn-highlight-alerting :bold)))) + '(sr-marked-file-face + ((t (:inherit zenburn-highlight-alerting)))) + '(sr-packaged-face + ((t (:inherit zenburn-primary-1)))) + '(sr-passive-path-face + ((t (:inherit zenburn-primary-1)))) + '(sr-symlink-directory-face + ((t (:inherit zenburn-blue)))) + '(sr-symlink-face + ((t (:inherit zenburn-blue-2)))) + '(sr-xml-face + ((t (:inherit zenburn-green-1)))) + + '(strokes-char ((t (:inherit font-lock-keyword)))) + + '(todoo-item-header + ((t (:inherit zenburn-primary-1)))) + '(todoo-item-assigned-header + ((t (:inherit zenburn-primary-2)))) + `(todoo-sub-item-header + ((t (:foreground ,zenburn-yellow)))) + + '(tuareg-font-lock-governing + ((t (:inherit zenburn-primary-2)))) + '(tuareg-font-lock-interactive-error + ((t (:inherit font-lock-warning)))) + '(tuareg-font-lock-interactive-output + ((t (:inherit zenburn-primary-3)))) + '(tuareg-font-lock-operator + ((t (:inherit font-lock-operator)))) + + '(w3m-form-button + ((t (:inherit widget-button)))) + '(w3m-form-button-pressed + ((t (:inherit widget-button-pressed)))) + '(w3m-form-button-mouse + ((t (:inherit widget-button-pressed)))) + '(w3m-tab-unselected + ((t (:box (:line-width 1 :style released-button))))) + '(w3m-tab-selected + ((t (:box (:line-width 1 :style pressed-button))))) + '(w3m-tab-unselected-retrieving + ((t (:inherit (w3m-tab-unselected widget-inactive))))) + '(w3m-tab-selected-retrieving + ((t (:inherit (w3m-tab-selected widget-inactive))))) + '(w3m-tab-background + ((t (:inherit zenburn-highlight-subtle)))) + '(w3m-anchor + ((t (:inherit zenburn-primary-1)))) + '(w3m-arrived-anchor + ((t (:inherit zenburn-primary-2)))) + '(w3m-image + ((t (:inherit zenburn-primary-4)))) + '(w3m-form + ((t (:inherit widget-field))))) ;; XXX: Updating this list is very tedious. ;; Are these aliases still necessary? From 809133015e70326fa9ba372f67eb1cb15aa0ff65 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 03:15:35 +0800 Subject: [PATCH 07/21] zenburn.el: merge in color-theme-install changes from https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn.el --- zenburn.el | 324 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 261 insertions(+), 63 deletions(-) diff --git a/zenburn.el b/zenburn.el index a1f1f84..7b901a3 100644 --- a/zenburn.el +++ b/zenburn.el @@ -1,6 +1,7 @@ ;;; zenburn.el --- just some alien fruit salad to keep you in the zone ;; Copyright (C) 2003, 2004, 2005, 2006, 2010, 2011 Daniel Brockman ;; Copyright (C) 2009 Adrian C., Bastien Guerry +;; Copyright (C) 2010 Bozhidar Batsov ;; Author: Daniel Brockman ;; URL: http://github.com/dbrock/zenburn-el @@ -22,12 +23,11 @@ ;; Software Foundation, 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. -;;; Code: - (require 'color-theme) (defvar zenburn-fg "#dcdccc") -(defvar zenburn-bg-1 "#282828") + +(defvar zenburn-bg-1 "#2b2b2b") (defvar zenburn-bg "#3f3f3f") (defvar zenburn-bg+1 "#4f4f4f") (defvar zenburn-bg+2 "#5f5f5f") @@ -55,11 +55,63 @@ (defvar zenburn-blue-2 "#6ca0a3") (defvar zenburn-blue-3 "#5c888b") (defvar zenburn-blue-4 "#4c7073") +(defvar zenburn-blue-5 "#366060") (defvar zenburn-magenta "#dc8cc3") +(eval-after-load 'term + '(setq ansi-term-color-vector + (vector 'unspecified zenburn-bg + zenburn-red zenburn-green + zenburn-yellow zenburn-blue+1 + zenburn-magenta zenburn-cyan + ;; dirty fix + "white"))) + (defvar font-lock-pseudo-keyword-face 'font-lock-pseudo-keyword-face) (defvar font-lock-operator-face 'font-lock-operator-face) +(setq-default erc-mode-line-format + (concat (propertize "%S" 'face + (list :weight 'bold + :foreground zenburn-yellow)) + " %a")) + + +(setq gnus-logo-colors `(,zenburn-bg+2 ,zenburn-bg+1) + gnus-mode-line-image-cache + '(image :type xpm :ascent center :data "/* XPM */ +static char *gnus-pointer[] = { +/* width height num_colors chars_per_pixel */ +\" 18 11 2 1\", +/* colors */ +\". c #dcdccc\", +\"# c None s None\", +/* pixels */ +\"######..##..######\", +\"#####........#####\", +\"#.##.##..##...####\", +\"#...####.###...##.\", +\"#..###.######.....\", +\"#####.########...#\", +\"###########.######\", +\"####.###.#..######\", +\"######..###.######\", +\"###....####.######\", +\"###..######.######\"};")) + +(defun zenburn-make-face-alias-clauses (alias-symbols) + (let (clauses) + (dolist (alias-symbol alias-symbols clauses) + (let ((alias-name (symbol-name alias-symbol))) + (if (not (string-match "-face" alias-name)) + (error "Invalid face alias: %s" alias-name) + (let ((target-name (replace-regexp-in-string + ".*\\(-face\\)" "" + alias-name nil nil 1))) + (push `(,(intern alias-name) + ((t (:inherit ,(intern target-name))))) + clauses))))))) + ;;;###autoload (defun color-theme-zenburn () "Just some alien fruit salad to keep you in the zone." @@ -106,8 +158,8 @@ '(zenburn-highlight-damp ((t (:foreground "#88b090" :background "#2e3330")))) - `(zenburn-highlight-alerting - ((t (:foreground ,zenburn-fg :background "#332323")))) + '(zenburn-highlight-alerting + ((t (:foreground "#e37170" :background "#332323")))) '(zenburn-highlight-subtle ((t (:background "#464646")))) @@ -142,6 +194,8 @@ ((t (:inherit zenburn-primary-4)))) '(font-lock-doc ((t (:inherit zenburn-green+1)))) + `(font-lock-doc-string + ((t (:foreground ,zenburn-blue+1)))) `(font-lock-function-name ((t (:foreground ,zenburn-yellow)))) '(font-lock-keyword @@ -159,6 +213,15 @@ '(font-lock-warning ((t (:inherit zenburn-highlight-alerting)))) + '(sh-heredoc ((t (:inherit font-lock-string)))) + + '(fixme-face ((t (:foreground "#dcdccc" :background "#3f3f3f" + :weight bold :box nil)))) ; Colours taken from vim ":hl Todo" + + '(semantic-tag-boundary-face ((t (:overline "#5f5f5f")))) ; zenburn-bg+2 + '(semantic-decoration-on-unparsed-includes + ((t (:foreground "#88b090" :background "#2e3330")))) ; zenburn-highlight-damp + '(font-lock-pseudo-keyword ((t (:inherit zenburn-primary-2)))) '(font-lock-operator @@ -255,18 +318,19 @@ `(minibuffer-prompt ((t (:foreground ,zenburn-yellow)))) `(Buffer-menu-buffer ((t (:inherit zenburn-primary-1)))) - '(region ((t (:foreground "#71d3b4" :background "#233323")))) - `(secondary-selection - ((t (:foreground ,zenburn-fg :background "#506070")))) + `(region ((t (:foreground nil :background ,zenburn-bg+2)))) + `(secondary-selection ((t (:foreground nil :background "#506070")))) '(trailing-whitespace ((t (:inherit font-lock-warning)))) - '(highlight ((t (:underline t)))) + '(highlight ((t (:background "#506070")))) '(paren ((t (:inherit zenburn-lowlight-1)))) '(show-paren-mismatch ((t (:inherit font-lock-warning)))) '(show-paren-match ((t (:inherit font-lock-keyword)))) '(match ((t (:weight bold)))) - `(cursor ((t (:background ,zenburn-fg :foreground ,zenburn-bg)))) + `(button ((t (:foreground ,zenburn-yellow :underline t)))) + + `(cursor ((t (:background "#aaaaaa" :foreground nil)))) '(hover-highlight ((t (:underline t :foreground "#f8f893")))) '(menu ((t nil))) '(mouse ((t (:inherit zenburn-foreground)))) @@ -277,13 +341,19 @@ '(ido-only-match ((t (:inherit zenburn-primary-2)))) `(ido-subdir ((t (:foreground ,zenburn-yellow)))) - `(isearch ((t (:foreground ,zenburn-fg :background "#506070")))) - `(isearch-lazy-highlight - ((t (:foreground ,zenburn-fg :background "#1e2320" :weight normal)))) + '(icompletep-choices ((t (:foreground "#dcdccc")))) ; zenburn-fg + '(icompletep-determined ((t (:foreground "#8FB28F")))) ; zenburn-green+1 + '(icompletep-nb-candidates ((t (:foreground "#AFD8AF")))) ; zenburn-green+3 + '(icompletep-keys ((t (:foreground "#CC9393")))) ; zenburn-red + + `(isearch ((t (:background "#668b8b" :foreground ,zenburn-fg :underline nil)))) + `(lazy-highlight ((t (:background "#506070" :foreground ,zenburn-fg :underline nil)))) '(mtorus-highlight ((t (:inherit zenburn-highlight-bluish)))) '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1)))) + '(minimap-active-region-background ((t (:foreground nil + :background "#233323")))) '(which-func ((t (:inherit mode-line)))) '(apt-utils-normal-package @@ -359,6 +429,8 @@ '(custom-variable-tag ((t (:inherit zenburn-primary-2)))) + `(mode-line-buffer-id ((t (:foreground ,zenburn-yellow :weight bold)))) + '(dictionary-button ((t (:inherit fancy-widget-button)))) '(dictionary-reference ((t (:inherit zenburn-primary-1)))) '(dictionary-word-entry ((t (:inherit font-lock-keyword)))) @@ -373,6 +445,26 @@ '(diff-context ((t (:inherit font-lock-comment)))) '(diff-refine-change ((t (:inherit zenburn-background-2)))) + `(ediff-current-diff-A ((t (:background "#495766" :foreground ,zenburn-fg)))) + `(ediff-current-diff-Ancestor ((t (:background "#495766" :foreground ,zenburn-fg)))) + `(ediff-current-diff-B ((t (:background "#495766" :foreground ,zenburn-fg)))) + `(ediff-current-diff-C ((t (:background "#495766" :foreground ,zenburn-fg)))) + + `(ediff-even-diff-A ((t (:background ,zenburn-bg+1)))) + `(ediff-even-diff-Ancestor ((t (:background ,zenburn-bg+1)))) + `(ediff-even-diff-B ((t (:background ,zenburn-bg+1)))) + `(ediff-even-diff-C ((t (:background ,zenburn-bg+1)))) + + `(ediff-odd-diff-A ((t (:background ,zenburn-bg+1)))) + `(ediff-odd-diff-Ancestor ((t (:background ,zenburn-bg+1)))) + `(ediff-odd-diff-B ((t (:background ,zenburn-bg+1)))) + `(ediff-odd-diff-C ((t (:background ,zenburn-bg+1)))) + + `(ediff-fine-diff-A ((t (:background "#668b8b" :foreground ,zenburn-fg)))) + `(ediff-fine-diff-Ancestor ((t (:background "#668b8b" :foreground ,zenburn-fg)))) + `(ediff-fine-diff-B ((t (:background "#668b8b" :foreground ,zenburn-fg)))) + `(ediff-fine-diff-C ((t (:background "#668b8b" :foreground ,zenburn-fg)))) + `(emms-pbi-song ((t (:foreground ,zenburn-yellow)))) '(emms-pbi-current ((t (:inherit zenburn-primary-1)))) '(emms-pbi-mark-marked ((t (:inherit zenburn-primary-2)))) @@ -404,8 +496,7 @@ '(rcirc-my-nick ((t (:inherit zenburn-primary-1)))) '(rcirc-other-nick ((t (:inherit bold)))) - '(rcirc-bright-nick - ((t (:foreground "white" :inherit rcirc-other-nick)))) + '(rcirc-bright-nick ((t (:foreground "white" :inherit rcirc-other-nick)))) '(rcirc-dim-nick ((t (:inherit font-lock-comment)))) '(rcirc-nick-in-message ((t (:inherit bold)))) '(rcirc-server ((t (:inherit font-lock-comment)))) @@ -431,9 +522,6 @@ `(elscreen-tab-other-screen ((t (:foreground ,zenburn-yellow :background ,zenburn-green)))) - '(flyspell-duplicate ((t (:inherit zenburn-primary-1)))) - '(flyspell-incorrect ((t (:inherit zenburn-primary-2)))) - '(highlight-current-line ((t (:inherit zenburn-highlight-subtle)))) '(ibuffer-deletion ((t (:inherit zenburn-primary-2)))) @@ -542,6 +630,7 @@ '(help-argument-name ((t (:weight bold)))) + ;; See also the variable definitions at the top of this file '(imaxima-latex-error ((t (:inherit font-lock-warning)))) `(info-xref ((t (:foreground ,zenburn-yellow :weight bold)))) @@ -707,6 +796,10 @@ '(setnu-line-number ((t (:inherit zenburn-lowlight-2)))) + `(smerge-mine ((t (:inherit font-lock-default-face)))) + `(smerge-other ((t (:inherit font-lock-default-face)))) + `(smerge-refined-change ((t (:background "#668b8b" :foreground ,zenburn-fg)))) + '(speedbar-button ((t (:inherit zenburn-primary-1)))) '(speedbar-file ((t (:inherit zenburn-primary-2)))) '(speedbar-directory ((t (:inherit zenburn-primary-5)))) @@ -793,7 +886,106 @@ '(w3m-image ((t (:inherit zenburn-primary-4)))) '(w3m-form - ((t (:inherit widget-field))))) + ((t (:inherit widget-field)))) + + `(hl-line ((t (:background ,zenburn-bg-1)))) + + '(magit-section-title ((t (:inherit zenburn-primary-1)))) + '(magit-branch ((t (:inherit zenburn-primary-2)))) + + '(flyspell-duplicate ((t (:inherit zenburn-primary-1)))) + '(flyspell-incorrect ((t (:inherit font-lock-warning)))) + + `(elscreen-tab-other-screen ((t ((:foreground ,zenburn-fg + :background ,zenburn-green-1))))) + `(elscreen-tab-current-screen ((t (:foreground ,zenburn-blue+1 + :background "#1e2320")))) + + '(wl-highlight-message-headers ((t (:inherit zenburn-red+1)))) + '(wl-highlight-message-header-contents ((t (:inherit zenburn-green)))) + '(wl-highlight-message-important-header-contents + ((t (:inherit zenburn-yellow)))) + '(wl-highlight-message-important-header-contents2 + ((t (:inherit zenburn-blue)))) + '(wl-highlight-message-unimportant-header-contents + ((t (:inherit zenburn-term-dark-gray)))) ;; reuse term + '(wl-highlight-message-citation-header ((t (:inherit zenburn-red)))) + + '(wl-highlight-message-cited-text-1 ((t (:inherit zenburn-green)))) + '(wl-highlight-message-cited-text-2 ((t (:inherit zenburn-blue)))) + '(wl-highlight-message-cited-text-3 ((t (:foreground "#8f8f8f")))) + '(wl-highlight-message-cited-text-4 ((t (:inherit zenburn-green)))) + + '(wl-highlight-message-signature ((t (:inherit zenburn-yellow)))) + + '(wl-highlight-summary-answered ((t (:inherit zenburn-fg)))) + '(wl-highlight-summary-new ((t (:foreground "#e89393")))) + + `(wl-highlight-summary-displaying ((t (:underline t + :foreground ,zenburn-yellow-2)))) + + '(wl-highlight-thread-indent ((t (:foreground "#ecbcec")))) + '(wl-highlight-summary-thread-top ((t (:foreground "#efdcbc")))) + + '(wl-highlight-summary-normal ((t (:inherit zenburn-fg)))) + + '(wl-highlight-folder-zero ((t (:inherit zenburn-fg)))) + '(wl-highlight-folder-few ((t (:inherit zenburn-red+1)))) + '(wl-highlight-folder-many ((t (:inherit zenburn-red+1)))) + '(wl-highlight-folder-unread ((t (:foreground "#e89393")))) + + '(wl-highlight-folder-path ((t (:inherit zenburn-orange)))) + + `(twitter-time-stamp ((t (:foreground ,zenburn-orange :background "#1e2320")))) + `(twitter-user-name ((t (:foreground "#acbc90" :background "#1e2320")))) + `(twitter-header ((t (:foreground ,zenburn-orange :background "#1e2320")))) + + '(rpm-spec-dir ((t (:inherit zenburn-green)))) + '(rpm-spec-doc ((t (:inherit zenburn-green)))) + '(rpm-spec-ghost ((t (:inherit zenburn-red)))) + '(rpm-spec-macro ((t (:inherit zenburn-yellow)))) + '(rpm-spec-obsolete-tag ((t (:inherit zenburn-red)))) + '(rpm-spec-package ((t (:inherit zenburn-red)))) + '(rpm-spec-section ((t (:inherit zenburn-yellow)))) + '(rpm-spec-tag ((t (:inherit zenburn-blue)))) + '(rpm-spec-var ((t (:inherit zenburn-red)))) + + '(mew-face-header-subject ((t (:inherit zenburn-orange)))) + '(mew-face-header-from ((t (:inherit zenburn-yellow)))) + '(mew-face-header-date ((t (:inherit zenburn-green)))) + '(mew-face-header-to ((t (:inherit zenburn-red)))) + '(mew-face-header-key ((t (:inherit zenburn-green)))) + '(mew-face-header-private ((t (:inherit zenburn-green)))) + '(mew-face-header-important ((t (:inherit zenburn-blue)))) + '(mew-face-header-marginal ((t (:inherit zenburn-term-dark-gray)))) + '(mew-face-header-warning ((t (:inherit zenburn-red)))) + '(mew-face-header-xmew ((t (:inherit zenburn-green)))) + '(mew-face-header-xmew-bad ((t (:inherit zenburn-red)))) + '(mew-face-body-url ((t (:inherit zenburn-orange)))) + '(mew-face-body-comment ((t (:inherit zenburn-term-dark-gray)))) + '(mew-face-body-cite1 ((t (:inherit zenburn-green)))) + '(mew-face-body-cite2 ((t (:inherit zenburn-blue)))) + '(mew-face-body-cite3 ((t (:inherit zenburn-orange)))) + '(mew-face-body-cite4 ((t (:inherit zenburn-yellow)))) + '(mew-face-body-cite5 ((t (:inherit zenburn-red)))) + '(mew-face-mark-review ((t (:inherit zenburn-blue)))) + '(mew-face-mark-escape ((t (:inherit zenburn-green)))) + '(mew-face-mark-delete ((t (:inherit zenburn-red)))) + '(mew-face-mark-unlink ((t (:inherit zenburn-yellow)))) + '(mew-face-mark-refile ((t (:inherit zenburn-green)))) + '(mew-face-mark-unread ((t (:inherit zenburn-red-2)))) + '(mew-face-eof-message ((t (:inherit zenburn-green)))) + '(mew-face-eof-part ((t (:inherit zenburn-yellow)))) + + '(nav-face-heading ((t (:inherit zenburn-yellow)))) + '(nav-face-button-num ((t (:inherit zenburn-cyan)))) + '(nav-face-dir ((t (:inherit zenburn-green)))) + '(nav-face-hdir ((t (:inherit zenburn-red)))) + '(nav-face-file ((t (:inherit zenburn-fg)))) + '(nav-face-hfile ((t (:inherit zenburn-red-4)))) + + '(svn-mark ((t (:inherit zenburn-blue)))) + ) ;; XXX: Updating this list is very tedious. ;; Are these aliases still necessary? @@ -896,6 +1088,7 @@ font-lock-comment-face font-lock-constant-face font-lock-doc-face + font-lock-doc-string-face font-lock-function-name-face font-lock-keyword-face font-lock-negation-char-face @@ -1046,6 +1239,15 @@ plain-widget-field-face plain-widget-inactive-face plain-widget-single-line-field-face + rpm-spec-dir-face + rpm-spec-doc-face + rpm-spec-ghost-face + rpm-spec-macro-face + rpm-spec-obsolete-tag-face + rpm-spec-package-face + rpm-spec-section-face + rpm-spec-tag-face + rpm-spec-var-face setnu-line-number-face show-paren-match-face show-paren-mismatch-face @@ -1074,6 +1276,7 @@ sr-symlink-face sr-xml-face strokes-char-face + svn-mark-face todoo-item-assigned-header-face todoo-item-header-face todoo-sub-item-header-face @@ -1101,53 +1304,48 @@ widget-field-face widget-inactive-face widget-single-line-field-face + flyspell-duplicate-face + flyspell-incorrect-face + wl-highlight-message-headers-face + wl-highlight-message-header-contents-face + wl-highlight-message-important-header-contents-face + wl-highlight-message-important-header-contents2-face + wl-highlight-message-unimportant-header-contents-face + wl-highlight-message-citation-header-face + wl-highlight-message-cited-text-1-face + wl-highlight-message-cited-text-2-face + wl-highlight-message-cited-text-3-face + wl-highlight-message-cited-text-4-face + wl-highlight-message-signature-face + wl-highlight-summary-answered-face + wl-highlight-summary-new-face + wl-highlight-summary-displaying-face + wl-highlight-thread-indent-face + wl-highlight-summary-thread-top-face + wl-highlight-summary-normal-face + wl-highlight-folder-zero-face + wl-highlight-folder-few-face + wl-highlight-folder-many-face + wl-highlight-folder-unread-face + wl-highlight-folder-path-face + elscreen-tab-background-face + elscreen-tab-control-face + elscreen-tab-current-screen-face + elscreen-tab-other-screen-face + identica-uri-face + twitter-time-stamp-face + twitter-user-name-face + twitter-header-face )))) - (eval-after-load 'term - '(setq ansi-term-color-vector - (vector 'unspecified zenburn-bg - zenburn-red zenburn-green - zenburn-yellow zenburn-blue+1 - zenburn-magenta zenburn-cyan - ;; XXX: Not sure why this is sometimes needed. - "white"))) - - (setq gnus-logo-colors `(,zenburn-bg+2 ,zenburn-bg+1) - gnus-mode-line-image-cache - '(image :type xpm :ascent center :data "/* XPM */ -static char *gnus-pointer[] = { -/* width height num_colors chars_per_pixel */ -\" 18 11 2 1\", -/* colors */ -\". c #dcdccc\", -\"# c None s None\", -/* pixels */ -\"######..##..######\", -\"#####........#####\", -\"#.##.##..##...####\", -\"#...####.###...##.\", -\"#..###.######.....\", -\"#####.########...#\", -\"###########.######\", -\"####.###.#..######\", -\"######..###.######\", -\"###....####.######\", -\"###..######.######\"};"))) - -(defun zenburn-make-face-alias-clauses (alias-symbols) - (let (clauses) - (dolist (alias-symbol alias-symbols clauses) - (let ((alias-name (symbol-name alias-symbol))) - (if (not (string-match "-face" alias-name)) - (error "Invalid face alias: %s" alias-name) - (let ((target-name (replace-regexp-in-string - ".*\\(-face\\)" "" - alias-name nil nil 1))) - (push `(,(intern alias-name) - ((t (:inherit ,(intern target-name))))) - clauses))))))) - (defalias 'zenburn #'color-theme-zenburn) (provide 'zenburn) + +;; Local Variables: +;; time-stamp-format: "%:y-%02m-%02d %02H:%02M" +;; time-stamp-start: "Updated: " +;; time-stamp-end: "$" +;; End: + ;;; zenburn.el ends here. From b1a989febe1cd073744351d4a8ae929bf18cb2c4 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 03:21:07 +0800 Subject: [PATCH 08/21] zenburn.el: sort-lines of zenburn-make-face-alias-clauses --- zenburn.el | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/zenburn.el b/zenburn.el index 7b901a3..cacf24a 100644 --- a/zenburn.el +++ b/zenburn.el @@ -1033,10 +1033,14 @@ static char *gnus-pointer[] = { diff-header-face diff-hunk-header-face diff-index-face - diff-removed-face diff-refine-change-face + diff-removed-face + elscreen-tab-background-face + elscreen-tab-control-face + elscreen-tab-current-screen-face elscreen-tab-current-screen-face elscreen-tab-other-screen-face + elscreen-tab-other-screen-face emms-pbi-current-face emms-pbi-mark-marked-face emms-pbi-song-face @@ -1078,6 +1082,8 @@ static char *gnus-pointer[] = { fancy-widget-inactive-face fancy-widget-single-line-field-face flyspell-duplicate-face + flyspell-duplicate-face + flyspell-incorrect-face flyspell-incorrect-face font-latex-bold-face font-latex-sedate-face @@ -1143,6 +1149,7 @@ static char *gnus-pointer[] = { ibuffer-help-buffer-face ibuffer-marked-face ibuffer-special-buffer-face + identica-uri-face ido-first-match-face ido-only-match-face ido-subdir-face @@ -1284,6 +1291,9 @@ static char *gnus-pointer[] = { tuareg-font-lock-interactive-error-face tuareg-font-lock-interactive-output-face tuareg-font-lock-operator-face + twitter-header-face + twitter-time-stamp-face + twitter-user-name-face w3m-anchor-face w3m-arrived-anchor-face w3m-form-button-face @@ -1304,38 +1314,28 @@ static char *gnus-pointer[] = { widget-field-face widget-inactive-face widget-single-line-field-face - flyspell-duplicate-face - flyspell-incorrect-face - wl-highlight-message-headers-face - wl-highlight-message-header-contents-face - wl-highlight-message-important-header-contents-face - wl-highlight-message-important-header-contents2-face - wl-highlight-message-unimportant-header-contents-face + wl-highlight-folder-few-face + wl-highlight-folder-many-face + wl-highlight-folder-path-face + wl-highlight-folder-unread-face + wl-highlight-folder-zero-face wl-highlight-message-citation-header-face wl-highlight-message-cited-text-1-face wl-highlight-message-cited-text-2-face wl-highlight-message-cited-text-3-face wl-highlight-message-cited-text-4-face + wl-highlight-message-header-contents-face + wl-highlight-message-headers-face + wl-highlight-message-important-header-contents-face + wl-highlight-message-important-header-contents2-face wl-highlight-message-signature-face + wl-highlight-message-unimportant-header-contents-face wl-highlight-summary-answered-face - wl-highlight-summary-new-face wl-highlight-summary-displaying-face - wl-highlight-thread-indent-face - wl-highlight-summary-thread-top-face + wl-highlight-summary-new-face wl-highlight-summary-normal-face - wl-highlight-folder-zero-face - wl-highlight-folder-few-face - wl-highlight-folder-many-face - wl-highlight-folder-unread-face - wl-highlight-folder-path-face - elscreen-tab-background-face - elscreen-tab-control-face - elscreen-tab-current-screen-face - elscreen-tab-other-screen-face - identica-uri-face - twitter-time-stamp-face - twitter-user-name-face - twitter-header-face + wl-highlight-summary-thread-top-face + wl-highlight-thread-indent-face )))) (defalias 'zenburn #'color-theme-zenburn) From dabf6e6313fe5e25bb9d800465330a9701c2ae19 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 03:52:24 +0800 Subject: [PATCH 09/21] zenburn.el: organise face definitions --- zenburn.el | 889 +++++++++++++++++++++++------------------------------ 1 file changed, 390 insertions(+), 499 deletions(-) diff --git a/zenburn.el b/zenburn.el index cacf24a..bb2af1e 100644 --- a/zenburn.el +++ b/zenburn.el @@ -138,15 +138,27 @@ static char *gnus-pointer[] = { (view-highlight-face . hover-highlight) (widget-mouse-face . hover-highlight)) + ;; FACE-DEFINITIONS alist + ;; + ;; organised as: + ;; 1. default + ;; 2. standard typographic formatting faces + ;; 3. zenburn-specific faces for later :inherit + ;; 4. emacs inline GUI elements' faces + ;; 5. emacs-frame and -window faces + ;; 6. alphabetically-ordered newline-separated face definitions for various modes + + ;; 1. default `(default ((t (:background ,zenburn-bg :foreground ,zenburn-fg)))) + ;; 2. standard typographic formatting faces '(bold ((t (:weight bold)))) '(bold-italic ((t (:italic t :weight bold)))) - '(fixed-pitch ((t (:weight bold)))) '(italic ((t (:slant italic)))) '(underline ((t (:underline t)))) + ;; 3. zenburn-specific faces for later :inherit `(zenburn-background-1 ((t (:background ,zenburn-bg+1)))) `(zenburn-background-2 ((t (:background ,zenburn-bg+2)))) @@ -156,12 +168,9 @@ static char *gnus-pointer[] = { '(zenburn-primary-4 ((t (:foreground "#dca3a3" :weight bold)))) '(zenburn-primary-5 ((t (:foreground "#94bff3" :weight bold)))) - '(zenburn-highlight-damp - ((t (:foreground "#88b090" :background "#2e3330")))) - '(zenburn-highlight-alerting - ((t (:foreground "#e37170" :background "#332323")))) - '(zenburn-highlight-subtle - ((t (:background "#464646")))) + '(zenburn-highlight-damp ((t (:foreground "#88b090" :background "#2e3330")))) + '(zenburn-highlight-alerting ((t (:foreground "#e37170" :background "#332323")))) + '(zenburn-highlight-subtle ((t (:background "#464646")))) '(zenburn-lowlight-1 ((t (:foreground "#606060")))) '(zenburn-lowlight-2 ((t (:foreground "#708070")))) @@ -184,57 +193,35 @@ static char *gnus-pointer[] = { '(zenburn-title ((t (:inherit variable-pitch :weight bold)))) - '(font-lock-builtin - ((t (:inherit zenburn-blue)))) - '(font-lock-comment - ((t (:inherit zenburn-green)))) - '(font-lock-comment-delimiter - ((t (:inherit zenburn-lowlight-2)))) - '(font-lock-constant - ((t (:inherit zenburn-primary-4)))) - '(font-lock-doc - ((t (:inherit zenburn-green+1)))) - `(font-lock-doc-string - ((t (:foreground ,zenburn-blue+1)))) - `(font-lock-function-name - ((t (:foreground ,zenburn-yellow)))) - '(font-lock-keyword - ((t (:inherit zenburn-primary-1)))) - '(font-lock-negation-char - ((t (:inherit zenburn-primary-1)))) - '(font-lock-preprocessor - ((t (:inherit zenburn-blue)))) - '(font-lock-string - ((t (:inherit zenburn-red)))) - '(font-lock-type - ((t (:inherit zenburn-primary-3)))) - `(font-lock-variable-name - ((t (:foreground ,zenburn-yellow)))) - '(font-lock-warning - ((t (:inherit zenburn-highlight-alerting)))) - - '(sh-heredoc ((t (:inherit font-lock-string)))) - - '(fixme-face ((t (:foreground "#dcdccc" :background "#3f3f3f" - :weight bold :box nil)))) ; Colours taken from vim ":hl Todo" + '(font-lock-builtin ((t (:inherit zenburn-blue)))) + '(font-lock-comment ((t (:inherit zenburn-green)))) + '(font-lock-comment-delimiter ((t (:inherit zenburn-lowlight-2)))) + '(font-lock-constant ((t (:inherit zenburn-primary-4)))) + '(font-lock-doc ((t (:inherit zenburn-green+1)))) + `(font-lock-doc-string ((t (:foreground ,zenburn-blue+1)))) + `(font-lock-function-name ((t (:foreground ,zenburn-yellow)))) + '(font-lock-keyword ((t (:inherit zenburn-primary-1)))) + '(font-lock-negation-char ((t (:inherit zenburn-primary-1)))) + '(font-lock-preprocessor ((t (:inherit zenburn-blue)))) + '(font-lock-string ((t (:inherit zenburn-red)))) + '(font-lock-type ((t (:inherit zenburn-primary-3)))) + `(font-lock-variable-name ((t (:foreground ,zenburn-yellow)))) + '(font-lock-warning ((t (:inherit zenburn-highlight-alerting)))) + '(fixme-face ((t (:foreground "#dcdccc" :background "#3f3f3f" :weight bold :box nil)))) ; Colours taken from vim ":hl Todo" ;; should just :inherit from font-lock-warning? + + '(font-lock-pseudo-keyword ((t (:inherit zenburn-primary-2)))) + '(font-lock-operator ((t (:inherit zenburn-primary-3)))) '(semantic-tag-boundary-face ((t (:overline "#5f5f5f")))) ; zenburn-bg+2 - '(semantic-decoration-on-unparsed-includes - ((t (:foreground "#88b090" :background "#2e3330")))) ; zenburn-highlight-damp + '(semantic-decoration-on-unparsed-includes ((t (:foreground "#88b090" :background "#2e3330")))) ; zenburn-highlight-damp - '(font-lock-pseudo-keyword - ((t (:inherit zenburn-primary-2)))) - '(font-lock-operator - ((t (:inherit zenburn-primary-3)))) + '(which-func ((t (:inherit mode-line)))) + + '(font-latex-bold ((t (:inherit bold)))) + '(font-latex-warning ((t (:inherit font-lock-warning)))) + '(font-latex-sedate ((t (:inherit zenburn-primary-1)))) + '(font-latex-title-4 ((t (:inherit zenburn-title)))) - '(term-default-bg ((t (nil)))) - '(term-default-bg-inv ((t (nil)))) - '(term-default-fg ((t (nil)))) - '(term-default-fg-inv ((t (nil)))) - '(term-invisible ((t (nil)))) ;; XXX: Security risk? - '(term-invisible-inv ((t (nil)))) - '(term-bold ((t (:weight bold)))) - '(term-underline ((t (:underline t)))) ;; XXX: Map these to ansi-term's faces (`term-red', etc.)? '(zenburn-term-dark-gray ((t (:foreground "#709080")))) @@ -255,65 +242,47 @@ static char *gnus-pointer[] = { '(zenburn-term-dark-yellow ((t (:foreground "#dfaf8f")))) `(zenburn-term-light-gray ((t (:foreground ,zenburn-fg)))) - '(plain-widget-button - ((t (:weight bold)))) - '(plain-widget-button-pressed - ((t (:inverse-video t)))) - '(plain-widget-documentation - ((t (:inherit font-lock-doc)))) - `(plain-widget-field - ((t (:background ,zenburn-bg+2)))) - '(plain-widget-inactive - ((t (:strike-through t)))) - `(plain-widget-single-line-field - ((t (:background ,zenburn-bg+2)))) - - `(fancy-widget-button - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style released-button))))) - `(fancy-widget-button-pressed - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style pressed-button))))) - `(fancy-widget-button-highlight - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style released-button))))) - `(fancy-widget-button-pressed-highlight - ((t (:background ,zenburn-bg+1 - :box (:line-width 2 :style pressed-button))))) - '(fancy-widget-documentation - ((t (:inherit font-lock-doc)))) - `(fancy-widget-field - ((t (:background ,zenburn-bg+2)))) - '(fancy-widget-inactive - ((t (:strike-through t)))) - `(fancy-widget-single-line-field - ((t (:background ,zenburn-bg+2)))) - - '(widget-button - ((t (:inherit plain-widget-button)))) - '(widget-button-pressed - ((t (:inherit fancy-widget-button-pressed)))) - '(widget-button-highlight - ((t (:inherit fancy-widget-button-highlight)))) - '(widget-button-pressed-highlight - ((t (:inherit fancy-widget-button-pressed-highlight)))) - '(widget-documentation - ((t (:inherit fancy-widget-documentation)))) - '(widget-field - ((t (:inherit fancy-widget-field)))) - '(widget-inactive - ((t (:inherit fancy-widget-inactive)))) - '(widget-single-line-field - ((t (:inherit fancy-widget-single-line-field)))) + ;; 4. emacs inline GUI elements' faces + '(plain-widget-button ((t (:weight bold)))) + '(plain-widget-button-pressed ((t (:inverse-video t)))) + '(plain-widget-documentation ((t (:inherit font-lock-doc)))) + `(plain-widget-field ((t (:background ,zenburn-bg+2)))) + '(plain-widget-inactive ((t (:strike-through t)))) + `(plain-widget-single-line-field ((t (:background ,zenburn-bg+2)))) + + `(fancy-widget-button ((t (:background ,zenburn-bg+1 :box (:line-width 2 :style released-button))))) + `(fancy-widget-button-pressed ((t (:background ,zenburn-bg+1 :box (:line-width 2 :style pressed-button))))) + `(fancy-widget-button-highlight ((t (:background ,zenburn-bg+1 :box (:line-width 2 :style released-button))))) + `(fancy-widget-button-pressed-highlight ((t (:background ,zenburn-bg+1 :box (:line-width 2 :style pressed-button))))) + '(fancy-widget-documentation ((t (:inherit font-lock-doc)))) + `(fancy-widget-field ((t (:background ,zenburn-bg+2)))) + '(fancy-widget-inactive ((t (:strike-through t)))) + `(fancy-widget-single-line-field ((t (:background ,zenburn-bg+2)))) + + '(widget-button ((t (:inherit plain-widget-button)))) + '(widget-button-pressed ((t (:inherit fancy-widget-button-pressed)))) + '(widget-button-highlight ((t (:inherit fancy-widget-button-highlight)))) + '(widget-button-pressed-highlight ((t (:inherit fancy-widget-button-pressed-highlight)))) + '(widget-documentation ((t (:inherit fancy-widget-documentation)))) + '(widget-field ((t (:inherit fancy-widget-field)))) + '(widget-inactive ((t (:inherit fancy-widget-inactive)))) + '(widget-single-line-field ((t (:inherit fancy-widget-single-line-field)))) + '(term-default-bg ((t (nil)))) + '(term-default-bg-inv ((t (nil)))) + '(term-default-fg ((t (nil)))) + '(term-default-fg-inv ((t (nil)))) + '(term-invisible ((t (nil)))) ;; XXX: Security risk? + '(term-invisible-inv ((t (nil)))) + '(term-bold ((t (:weight bold)))) + '(term-underline ((t (:underline t)))) + + ;; 5. emacs-frame and -window faces `(border ((t (:background ,zenburn-bg)))) '(fringe ((t (:inherit zenburn-highlight-subtle)))) - '(header-line ((t (:inherit zenburn-highlight-damp - :box (:color "#2e3330" :line-width 2))))) - '(mode-line ((t (:foreground "#acbc90" :background "#1e2320" - :box (:color "#1e2320" :line-width 2))))) - '(mode-line-inactive ((t (:background "#2e3330" :foreground "#88b090" - :box (:color "#2e3330" :line-width 2))))) + '(header-line ((t (:inherit zenburn-highlight-damp :box (:color "#2e3330" :line-width 2))))) + '(mode-line ((t (:foreground "#acbc90" :background "#1e2320" :box (:color "#1e2320" :line-width 2))))) + '(mode-line-inactive ((t (:background "#2e3330" :foreground "#88b090" :box (:color "#2e3330" :line-width 2))))) `(mode-line-buffer-id ((t (:foreground ,zenburn-yellow :weight bold)))) `(minibuffer-prompt ((t (:foreground ,zenburn-yellow)))) `(Buffer-menu-buffer ((t (:inherit zenburn-primary-1)))) @@ -337,138 +306,118 @@ static char *gnus-pointer[] = { `(scroll-bar ((t (:background ,zenburn-bg+2)))) `(tool-bar ((t (:background ,zenburn-bg+2)))) - '(ido-first-match ((t (:inherit zenburn-primary-1)))) - '(ido-only-match ((t (:inherit zenburn-primary-2)))) - `(ido-subdir ((t (:foreground ,zenburn-yellow)))) - '(icompletep-choices ((t (:foreground "#dcdccc")))) ; zenburn-fg - '(icompletep-determined ((t (:foreground "#8FB28F")))) ; zenburn-green+1 - '(icompletep-nb-candidates ((t (:foreground "#AFD8AF")))) ; zenburn-green+3 - '(icompletep-keys ((t (:foreground "#CC9393")))) ; zenburn-red - `(isearch ((t (:background "#668b8b" :foreground ,zenburn-fg :underline nil)))) - `(lazy-highlight ((t (:background "#506070" :foreground ,zenburn-fg :underline nil)))) + ;; 6. alphabetically-ordered newline-separated face definitions - '(mtorus-highlight ((t (:inherit zenburn-highlight-bluish)))) - '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1)))) + ; apt + '(apt-utils-normal-package ((t (:inherit zenburn-primary-1)))) + '(apt-utils-virtual-package ((t (:inherit zenburn-primary-2)))) + '(apt-utils-field-keyword ((t (:inherit font-lock-doc)))) + '(apt-utils-field-contents ((t (:inherit font-lock-comment)))) + '(apt-utils-summary ((t (:inherit bold)))) + '(apt-utils-description ((t (:inherit default)))) + '(apt-utils-version ((t (:inherit zenburn-blue)))) + '(apt-utils-broken ((t (:inherit font-lock-warning)))) - '(minimap-active-region-background ((t (:foreground nil - :background "#233323")))) - '(which-func ((t (:inherit mode-line)))) - - '(apt-utils-normal-package - ((t (:inherit zenburn-primary-1)))) - '(apt-utils-virtual-package - ((t (:inherit zenburn-primary-2)))) - '(apt-utils-field-keyword - ((t (:inherit font-lock-doc)))) - '(apt-utils-field-contents - ((t (:inherit font-lock-comment)))) - '(apt-utils-summary - ((t (:inherit bold)))) - '(apt-utils-description - ((t (:inherit default)))) - '(apt-utils-version - ((t (:inherit zenburn-blue)))) - '(apt-utils-broken - ((t (:inherit font-lock-warning)))) + ; bongo + '(bongo-unfilled-seek-bar ((t (:background "#606060")))) + ; breakpoint '(breakpoint-enabled-bitmap ((t (:inherit zenburn-primary-1)))) '(breakpoint-disabled-bitmap ((t (:inherit font-lock-comment)))) + ; calendar '(calendar-today ((t (:underline nil :inherit zenburn-primary-2)))) '(diary ((t (:underline nil :inherit zenburn-primary-1)))) '(holiday ((t (:underline t :inherit zenburn-primary-4)))) - '(bongo-unfilled-seek-bar ((t (:background "#606060")))) - + ; change-log '(change-log-date ((t (:inherit zenburn-blue)))) + ; circe + '(circe-highlight-nick-face ((t (:inherit zenburn-primary-1)))) + '(circe-my-message-face ((t (:inherit zenburn-yellow)))) + '(circe-originator-face ((t (:inherit bold)))) + '(circe-prompt-face ((t (:inherit zenburn-primary-1)))) + '(circe-server-face ((t (:inherit font-lock-comment-face)))) + + ; comint '(comint-highlight-input ((t (:inherit zenburn-primary-1)))) '(comint-highlight-prompt ((t (:inherit zenburn-primary-2)))) + ; compilation '(compilation-info ((t (:inherit zenburn-primary-1)))) '(compilation-warning ((t (:inherit font-lock-warning)))) + ; cua '(cua-rectangle ((t (:inherit region)))) - '(custom-button - ((t (:inherit fancy-widget-button)))) - '(custom-button-pressed - ((t (:inherit fancy-widget-button-pressed)))) - '(custom-changed - ((t (:inherit zenburn-blue)))) - '(custom-comment - ((t (:inherit font-lock-doc)))) - '(custom-comment-tag - ((t (:inherit font-lock-doc)))) - '(custom-documentation - ((t (:inherit font-lock-doc)))) - '(custom-link - ((t (:inherit zenburn-yellow :underline t)))) - '(custom-tag - ((t (:inherit zenburn-primary-2)))) - '(custom-group-tag - ((t (:inherit zenburn-primary-1)))) - '(custom-group-tag-1 - ((t (:inherit zenburn-primary-4)))) - '(custom-invalid - ((t (:inherit font-lock-warning)))) - '(custom-modified - ((t (:inherit zenburn-primary-3)))) - '(custom-rogue - ((t (:inhrit font-lock-warning)))) - '(custom-saved - ((t (:underline t)))) - '(custom-set - ((t (:inverse-video t :inherit zenburn-blue)))) - '(custom-state - ((t (:inherit font-lock-comment)))) - '(custom-variable-button - ((t (:weight bold :underline t)))) - '(custom-variable-tag - ((t (:inherit zenburn-primary-2)))) - - `(mode-line-buffer-id ((t (:foreground ,zenburn-yellow :weight bold)))) - + ; custom + '(custom-button ((t (:inherit fancy-widget-button)))) + '(custom-button-pressed ((t (:inherit fancy-widget-button-pressed)))) + '(custom-changed ((t (:inherit zenburn-blue)))) + '(custom-comment ((t (:inherit font-lock-doc)))) + '(custom-comment-tag ((t (:inherit font-lock-doc)))) + '(custom-documentation ((t (:inherit font-lock-doc)))) + '(custom-link ((t (:inherit zenburn-yellow :underline t)))) + '(custom-tag ((t (:inherit zenburn-primary-2)))) + '(custom-group-tag ((t (:inherit zenburn-primary-1)))) + '(custom-group-tag-1 ((t (:inherit zenburn-primary-4)))) + '(custom-invalid ((t (:inherit font-lock-warning)))) + '(custom-modified ((t (:inherit zenburn-primary-3)))) + '(custom-rogue ((t (:inhrit font-lock-warning)))) + '(custom-saved ((t (:underline t)))) + '(custom-set ((t (:inverse-video t :inherit zenburn-blue)))) + '(custom-state ((t (:inherit font-lock-comment)))) + '(custom-variable-button ((t (:weight bold :underline t)))) + '(custom-variable-tag ((t (:inherit zenburn-primary-2)))) + + ; dictionary '(dictionary-button ((t (:inherit fancy-widget-button)))) '(dictionary-reference ((t (:inherit zenburn-primary-1)))) '(dictionary-word-entry ((t (:inherit font-lock-keyword)))) + ; diff '(diff-header ((t (:inherit zenburn-highlight-subtle)))) '(diff-index ((t (:inherit bold)))) '(diff-file-header ((t (:inherit bold)))) '(diff-hunk-header ((t (:inherit zenburn-highlight-subtle)))) - '(diff-added ((t (:inherit zenburn-primary-3)))) '(diff-removed ((t (:inherit zenburn-blue)))) '(diff-context ((t (:inherit font-lock-comment)))) '(diff-refine-change ((t (:inherit zenburn-background-2)))) + ; ediff `(ediff-current-diff-A ((t (:background "#495766" :foreground ,zenburn-fg)))) `(ediff-current-diff-Ancestor ((t (:background "#495766" :foreground ,zenburn-fg)))) `(ediff-current-diff-B ((t (:background "#495766" :foreground ,zenburn-fg)))) `(ediff-current-diff-C ((t (:background "#495766" :foreground ,zenburn-fg)))) - `(ediff-even-diff-A ((t (:background ,zenburn-bg+1)))) `(ediff-even-diff-Ancestor ((t (:background ,zenburn-bg+1)))) `(ediff-even-diff-B ((t (:background ,zenburn-bg+1)))) `(ediff-even-diff-C ((t (:background ,zenburn-bg+1)))) - `(ediff-odd-diff-A ((t (:background ,zenburn-bg+1)))) `(ediff-odd-diff-Ancestor ((t (:background ,zenburn-bg+1)))) `(ediff-odd-diff-B ((t (:background ,zenburn-bg+1)))) `(ediff-odd-diff-C ((t (:background ,zenburn-bg+1)))) - `(ediff-fine-diff-A ((t (:background "#668b8b" :foreground ,zenburn-fg)))) `(ediff-fine-diff-Ancestor ((t (:background "#668b8b" :foreground ,zenburn-fg)))) `(ediff-fine-diff-B ((t (:background "#668b8b" :foreground ,zenburn-fg)))) `(ediff-fine-diff-C ((t (:background "#668b8b" :foreground ,zenburn-fg)))) + ; elscreen + ;;'(elscreen-tab-current-screen ((t (:inherit zenburn-primary-1)))) + `(elscreen-tab-current-screen ((t (:foreground ,zenburn-blue+1 :background "#1e2320")))) + ;;`(elscreen-tab-other-screen ((t ((:foreground ,zenburn-fg :background ,zenburn-green-1))))) + `(elscreen-tab-other-screen ((t (:foreground ,zenburn-yellow :background ,zenburn-green)))) + + ; emms `(emms-pbi-song ((t (:foreground ,zenburn-yellow)))) '(emms-pbi-current ((t (:inherit zenburn-primary-1)))) '(emms-pbi-mark-marked ((t (:inherit zenburn-primary-2)))) + ; erc '(erc-action ((t (:inherit erc-default)))) '(erc-bold ((t (:weight bold)))) '(erc-current-nick ((t (:inherit zenburn-primary-1)))) @@ -488,23 +437,7 @@ static char *gnus-pointer[] = { '(erc-timestamp ((t (:inherit zenburn-green+1)))) '(erc-underline ((t (:inherit underline)))) - '(circe-highlight-nick-face ((t (:inherit zenburn-primary-1)))) - '(circe-my-message-face ((t (:inherit zenburn-yellow)))) - '(circe-originator-face ((t (:inherit bold)))) - '(circe-prompt-face ((t (:inherit zenburn-primary-1)))) - '(circe-server-face ((t (:inherit font-lock-comment-face)))) - - '(rcirc-my-nick ((t (:inherit zenburn-primary-1)))) - '(rcirc-other-nick ((t (:inherit bold)))) - '(rcirc-bright-nick ((t (:foreground "white" :inherit rcirc-other-nick)))) - '(rcirc-dim-nick ((t (:inherit font-lock-comment)))) - '(rcirc-nick-in-message ((t (:inherit bold)))) - '(rcirc-server ((t (:inherit font-lock-comment)))) - '(rcirc-server-prefix ((t (:inherit font-lock-comment-delimiter)))) - '(rcirc-timestamp ((t (:inherit font-lock-comment)))) - '(rcirc-prompt ((t (:inherit zenburn-primary-1)))) - '(rcirc-mode-line-nick ((t (:inherit zenburn-primary-1)))) - + ; eshell '(eshell-prompt ((t (:inherit zenburn-primary-1)))) '(eshell-ls-archive ((t (:foreground "#c3bf9f" :weight bold)))) '(eshell-ls-backup ((t (:inherit font-lock-comment)))) @@ -517,30 +450,11 @@ static char *gnus-pointer[] = { '(eshell-ls-special ((t (:inherit zenburn-primary-1)))) `(eshell-ls-symlink ((t (:foreground ,zenburn-cyan :weight bold)))) - '(elscreen-tab-current-screen - ((t (:inherit zenburn-primary-1)))) - `(elscreen-tab-other-screen - ((t (:foreground ,zenburn-yellow :background ,zenburn-green)))) - - '(highlight-current-line ((t (:inherit zenburn-highlight-subtle)))) - - '(ibuffer-deletion ((t (:inherit zenburn-primary-2)))) - '(ibuffer-marked ((t (:inherit zenburn-primary-1)))) - '(ibuffer-special-buffer ((t (:inherit font-lock-doc)))) - '(ibuffer-help-buffer ((t (:inherit font-lock-comment)))) - - '(message-cited-text ((t (:inherit font-lock-comment)))) - '(message-header-name ((t (:inherit zenburn-green+1)))) - '(message-header-other ((t (:inherit zenburn-green)))) - '(message-header-to ((t (:inherit zenburn-primary-1)))) - '(message-header-from ((t (:inherit zenburn-primary-1)))) - '(message-header-cc ((t (:inherit zenburn-primary-1)))) - '(message-header-newsgroups ((t (:inherit zenburn-primary-1)))) - '(message-header-subject ((t (:inherit zenburn-primary-2)))) - '(message-header-xheader ((t (:inherit zenburn-green)))) - '(message-mml ((t (:inherit zenburn-primary-1)))) - '(message-separator ((t (:inherit font-lock-comment)))) + ; flyspell + '(flyspell-duplicate ((t (:inherit zenburn-primary-1)))) + '(flyspell-incorrect ((t (:inherit font-lock-warning)))) + ; gnus '(gnus-header-name ((t (:inherit message-header-name)))) '(gnus-header-content ((t (:inherit message-header-other)))) '(gnus-header-from ((t (:inherit message-header-from)))) @@ -595,44 +509,56 @@ static char *gnus-pointer[] = { `(gnus-signature ((t (:foreground ,zenburn-yellow)))) - '(gnus-summary-selected - ((t (:inherit zenburn-primary-1)))) - '(gnus-summary-cancelled - ((t (:inherit zenburn-highlight-alerting)))) - - '(gnus-summary-low-ticked - ((t (:inherit zenburn-primary-2)))) - '(gnus-summary-normal-ticked - ((t (:inherit zenburn-primary-2)))) - '(gnus-summary-high-ticked - ((t (:inherit zenburn-primary-2)))) - - '(gnus-summary-low-unread - ((t (:inherit zenburn-foreground :weight normal)))) - '(gnus-summary-normal-unread - ((t (:inherit zenburn-foreground :weight normal)))) - '(gnus-summary-high-unread - ((t (:inherit zenburn-foreground :weight bold)))) - - '(gnus-summary-low-read - ((t (:inherit zenburn-green :weight normal)))) - '(gnus-summary-normal-read - ((t (:inherit zenburn-green :weight normal)))) - '(gnus-summary-high-read - ((t (:inherit zenburn-green :weight bold)))) - - '(gnus-summary-low-ancient - ((t (:inherit zenburn-blue :weight normal)))) - '(gnus-summary-normal-ancient - ((t (:inherit zenburn-blue :weight normal)))) - '(gnus-summary-high-ancient - ((t (:inherit zenburn-blue)))) + '(gnus-summary-selected ((t (:inherit zenburn-primary-1)))) + '(gnus-summary-cancelled ((t (:inherit zenburn-highlight-alerting)))) + + '(gnus-summary-low-ticked ((t (:inherit zenburn-primary-2)))) + '(gnus-summary-normal-ticked ((t (:inherit zenburn-primary-2)))) + '(gnus-summary-high-ticked ((t (:inherit zenburn-primary-2)))) + '(gnus-summary-low-unread ((t (:inherit zenburn-foreground :weight normal)))) + '(gnus-summary-normal-unread ((t (:inherit zenburn-foreground :weight normal)))) + '(gnus-summary-high-unread ((t (:inherit zenburn-foreground :weight bold)))) + + '(gnus-summary-low-read ((t (:inherit zenburn-green :weight normal)))) + '(gnus-summary-normal-read ((t (:inherit zenburn-green :weight normal)))) + '(gnus-summary-high-read ((t (:inherit zenburn-green :weight bold)))) + + '(gnus-summary-low-ancient ((t (:inherit zenburn-blue :weight normal)))) + '(gnus-summary-normal-ancient ((t (:inherit zenburn-blue :weight normal)))) + '(gnus-summary-high-ancient ((t (:inherit zenburn-blue)))) + + ; help '(help-argument-name ((t (:weight bold)))) + ; highlight-current-line + '(highlight-current-line ((t (:inherit zenburn-highlight-subtle)))) + + ; hl-line + `(hl-line ((t (:background ,zenburn-bg-1)))) + + ; ibuffer + '(ibuffer-deletion ((t (:inherit zenburn-primary-2)))) + '(ibuffer-marked ((t (:inherit zenburn-primary-1)))) + '(ibuffer-special-buffer ((t (:inherit font-lock-doc)))) + '(ibuffer-help-buffer ((t (:inherit font-lock-comment)))) + + ; icompletep + '(icompletep-choices ((t (:foreground "#dcdccc")))) ; zenburn-fg + '(icompletep-determined ((t (:foreground "#8FB28F")))) ; zenburn-green+1 + '(icompletep-nb-candidates ((t (:foreground "#AFD8AF")))) ; zenburn-green+3 + '(icompletep-keys ((t (:foreground "#CC9393")))) ; zenburn-red + + ; ido + '(ido-first-match ((t (:inherit zenburn-primary-1)))) + '(ido-only-match ((t (:inherit zenburn-primary-2)))) + `(ido-subdir ((t (:foreground ,zenburn-yellow)))) + + ; imaxima ;; See also the variable definitions at the top of this file '(imaxima-latex-error ((t (:inherit font-lock-warning)))) + ; info `(info-xref ((t (:foreground ,zenburn-yellow :weight bold)))) '(info-xref-visited ((t (:inherit info-xref :weight normal)))) '(info-header-xref ((t (:inherit info-xref)))) @@ -641,93 +567,128 @@ static char *gnus-pointer[] = { '(info-node ((t (:weight bold)))) '(info-header-node ((t (:weight normal)))) - '(jabber-roster-user-chatty - ((t (:inherit zenburn-primary-1)))) - '(jabber-roster-user-online - ((t (:inherit zenburn-primary-2)))) - '(jabber-roster-user-away - ((t (:inherit font-lock-doc)))) - '(jabber-roster-user-xa - ((t (:inherit font-lock-comment)))) - '(jabber-roster-user-offline - ((t (:inherit zenburn-lowlight-1)))) - '(jabber-roster-user-dnd - ((t (:inherit zenburn-primary-5)))) - '(jabber-roster-user-error - ((t (:inherit font-lock-warning)))) - - '(jabber-title-small - ((t (:inherit zenburn-title :height 1.2)))) - '(jabber-title-medium - ((t (:inherit jabber-title-small :height 1.2)))) - '(jabber-title-large - ((t (:inherit jabber-title-medium :height 1.2)))) - - '(jabber-chat-prompt-local - ((t (:inherit zenburn-primary-1)))) - '(jabber-chat-prompt-foreign - ((t (:inherit zenburn-primary-2)))) - - '(jabber-rare-time-face - ((t (:inherit zenburn-green+1)))) - - '(jde-java-font-lock-modifier - ((t (:inherit zenburn-primary-2)))) - '(jde-java-font-lock-doc-tag - ((t (:inherit zenburn-primary-1)))) - '(jde-java-font-lock-constant - ((t (:inherit font-lock-constant)))) - '(jde-java-font-lock-package - ((t (:inherit zenburn-primary-3)))) - '(jde-java-font-lock-number - ((t (:inherit font-lock-constant)))) - '(jde-java-font-lock-operator - ((t (:inherit font-lock-keyword)))) - '(jde-java-font-lock-link - ((t (:inherit zenburn-primary-5 :underline t)))) + ; isearch + `(isearch ((t (:background "#668b8b" :foreground ,zenburn-fg :underline nil)))) + + ; jabber + '(jabber-roster-user-chatty ((t (:inherit zenburn-primary-1)))) + '(jabber-roster-user-online ((t (:inherit zenburn-primary-2)))) + '(jabber-roster-user-away ((t (:inherit font-lock-doc)))) + '(jabber-roster-user-xa ((t (:inherit font-lock-comment)))) + '(jabber-roster-user-offline ((t (:inherit zenburn-lowlight-1)))) + '(jabber-roster-user-dnd ((t (:inherit zenburn-primary-5)))) + '(jabber-roster-user-error ((t (:inherit font-lock-warning)))) + + '(jabber-title-small ((t (:inherit zenburn-title :height 1.2)))) + '(jabber-title-medium ((t (:inherit jabber-title-small :height 1.2)))) + '(jabber-title-large ((t (:inherit jabber-title-medium :height 1.2)))) + + '(jabber-chat-prompt-local ((t (:inherit zenburn-primary-1)))) + '(jabber-chat-prompt-foreign ((t (:inherit zenburn-primary-2)))) + '(jabber-rare-time-face ((t (:inherit zenburn-green+1)))) + + + ; jde + '(jde-java-font-lock-modifier ((t (:inherit zenburn-primary-2)))) + '(jde-java-font-lock-doc-tag ((t (:inherit zenburn-primary-1)))) + '(jde-java-font-lock-constant ((t (:inherit font-lock-constant)))) + '(jde-java-font-lock-package ((t (:inherit zenburn-primary-3)))) + '(jde-java-font-lock-number ((t (:inherit font-lock-constant)))) + '(jde-java-font-lock-operator ((t (:inherit font-lock-keyword)))) + '(jde-java-font-lock-link ((t (:inherit zenburn-primary-5 :underline t)))) + + ; keywiz '(keywiz-right ((t (:inherit zenburn-primary-1)))) '(keywiz-wrong ((t (:inherit font-lock-warning)))) '(keywiz-command ((t (:inherit zenburn-primary-2)))) - '(font-latex-bold ((t (:inherit bold)))) - '(font-latex-warning ((t (:inherit font-lock-warning)))) - '(font-latex-sedate ((t (:inherit zenburn-primary-1)))) - '(font-latex-title-4 ((t (:inherit zenburn-title)))) + ; lazy-highlight + `(lazy-highlight ((t (:background "#506070" :foreground ,zenburn-fg :underline nil)))) + ; magit + '(magit-section-title ((t (:inherit zenburn-primary-1)))) + '(magit-branch ((t (:inherit zenburn-primary-2)))) + + ; makefile '(makefile-space ((t (:inherit font-lock-warning)))) '(makefile-shell ((t (nil)))) + ; message + '(message-cited-text ((t (:inherit font-lock-comment)))) + '(message-header-name ((t (:inherit zenburn-green+1)))) + '(message-header-other ((t (:inherit zenburn-green)))) + '(message-header-to ((t (:inherit zenburn-primary-1)))) + '(message-header-from ((t (:inherit zenburn-primary-1)))) + '(message-header-cc ((t (:inherit zenburn-primary-1)))) + '(message-header-newsgroups ((t (:inherit zenburn-primary-1)))) + '(message-header-subject ((t (:inherit zenburn-primary-2)))) + '(message-header-xheader ((t (:inherit zenburn-green)))) + '(message-mml ((t (:inherit zenburn-primary-1)))) + '(message-separator ((t (:inherit font-lock-comment)))) + + ; mew + '(mew-face-header-subject ((t (:inherit zenburn-orange)))) + '(mew-face-header-from ((t (:inherit zenburn-yellow)))) + '(mew-face-header-date ((t (:inherit zenburn-green)))) + '(mew-face-header-to ((t (:inherit zenburn-red)))) + '(mew-face-header-key ((t (:inherit zenburn-green)))) + '(mew-face-header-private ((t (:inherit zenburn-green)))) + '(mew-face-header-important ((t (:inherit zenburn-blue)))) + '(mew-face-header-marginal ((t (:inherit zenburn-term-dark-gray)))) + '(mew-face-header-warning ((t (:inherit zenburn-red)))) + '(mew-face-header-xmew ((t (:inherit zenburn-green)))) + '(mew-face-header-xmew-bad ((t (:inherit zenburn-red)))) + '(mew-face-body-url ((t (:inherit zenburn-orange)))) + '(mew-face-body-comment ((t (:inherit zenburn-term-dark-gray)))) + '(mew-face-body-cite1 ((t (:inherit zenburn-green)))) + '(mew-face-body-cite2 ((t (:inherit zenburn-blue)))) + '(mew-face-body-cite3 ((t (:inherit zenburn-orange)))) + '(mew-face-body-cite4 ((t (:inherit zenburn-yellow)))) + '(mew-face-body-cite5 ((t (:inherit zenburn-red)))) + '(mew-face-mark-review ((t (:inherit zenburn-blue)))) + '(mew-face-mark-escape ((t (:inherit zenburn-green)))) + '(mew-face-mark-delete ((t (:inherit zenburn-red)))) + '(mew-face-mark-unlink ((t (:inherit zenburn-yellow)))) + '(mew-face-mark-refile ((t (:inherit zenburn-green)))) + '(mew-face-mark-unread ((t (:inherit zenburn-red-2)))) + '(mew-face-eof-message ((t (:inherit zenburn-green)))) + '(mew-face-eof-part ((t (:inherit zenburn-yellow)))) + + ; minimap + '(minimap-active-region-background ((t (:foreground nil :background "#233323")))) + + ; mtorus + '(mtorus-highlight ((t (:inherit zenburn-highlight-bluish)))) + '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1)))) + + ; nav + '(nav-face-heading ((t (:inherit zenburn-yellow)))) + '(nav-face-button-num ((t (:inherit zenburn-cyan)))) + '(nav-face-dir ((t (:inherit zenburn-green)))) + '(nav-face-hdir ((t (:inherit zenburn-red)))) + '(nav-face-file ((t (:inherit zenburn-fg)))) + '(nav-face-hfile ((t (:inherit zenburn-red-4)))) + + ; nxml '(nxml-delimited-data ((t (:inherit font-lock-string)))) '(nxml-name ((t (:inherit zenburn-primary-1)))) '(nxml-ref ((t (:inherit zenburn-primary-5)))) '(nxml-delimiter ((t (:inherit default)))) '(nxml-text ((t (:inherit default)))) - '(nxml-comment-content - ((t (:inherit font-lock-comment)))) - '(nxml-comment-delimiter - ((t (:inherit nxml-comment-content)))) - '(nxml-processing-instruction-target - ((t (:inherit zenburn-primary-2)))) - '(nxml-processing-instruction-delimiter - ((t (:inherit nxml-processing-instruction-target)))) - '(nxml-processing-instruction-content - ((t (:inherit nxml-processing-instruction-target)))) - '(nxml-cdata-section-CDATA - ((t (:inherit zenburn-primary-4)))) - '(nxml-cdata-section-delimiter - ((t (:inherit nxml-cdata-section-CDATA)))) - '(nxml-cdata-section-content - ((t (:inherit nxml-text)))) - '(nxml-entity-ref-name - ((t (:inherit zenburn-primary-5)))) - '(nxml-entity-ref-delimiter - ((t (:inherit nxml-entity-ref-name)))) - '(nxml-char-ref-number - ((t (:inherit nxml-entity-ref-name)))) - '(nxml-char-ref-delimiter - ((t (:inherit nxml-entity-ref-delimiter)))) + '(nxml-comment-content ((t (:inherit font-lock-comment)))) + '(nxml-comment-delimiter ((t (:inherit nxml-comment-content)))) + '(nxml-processing-instruction-target ((t (:inherit zenburn-primary-2)))) + '(nxml-processing-instruction-delimiter ((t (:inherit nxml-processing-instruction-target)))) + '(nxml-processing-instruction-content ((t (:inherit nxml-processing-instruction-target)))) + '(nxml-cdata-section-CDATA ((t (:inherit zenburn-primary-4)))) + '(nxml-cdata-section-delimiter ((t (:inherit nxml-cdata-section-CDATA)))) + '(nxml-cdata-section-content ((t (:inherit nxml-text)))) + '(nxml-entity-ref-name ((t (:inherit zenburn-primary-5)))) + '(nxml-entity-ref-delimiter ((t (:inherit nxml-entity-ref-name)))) + '(nxml-char-ref-number ((t (:inherit nxml-entity-ref-name)))) + '(nxml-char-ref-delimiter ((t (:inherit nxml-entity-ref-delimiter)))) '(nxml-tag-delimiter ((t (:inherit default)))) '(nxml-tag-slash ((t (:inherit default)))) @@ -735,30 +696,20 @@ static char *gnus-pointer[] = { '(nxml-element-prefix ((t (:inherit default)))) '(nxml-element-colon ((t (:inherit default)))) - '(nxml-attribute-local-name - ((t (:inherit zenburn-primary-3)))) - '(nxml-namespace-attribute-prefix - ((t (:inherit nxml-attribute-local-name)))) - '(nxml-attribute-value - ((t (:inherit font-lock-string)))) - '(nxml-attribute-value-delimiter - ((t (:inherit nxml-attribute-value)))) - '(nxml-attribute-prefix - ((t (:inherit default)))) - '(nxml-namespace-attribute-xmlns - ((t (:inherit nxml-attribute-prefix)))) - '(nxml-attribute-colon - ((t (:inherit default)))) - '(nxml-namespace-attribute-colon - ((t (:inherit nxml-attribute-colon)))) - - '(org-agenda-date-today - ((t (:foreground "white" :slant italic :weight bold))) t) - '(org-agenda-structure - ((t (:inherit font-lock-comment-face)))) + '(nxml-attribute-local-name ((t (:inherit zenburn-primary-3)))) + '(nxml-namespace-attribute-prefix ((t (:inherit nxml-attribute-local-name)))) + '(nxml-attribute-value ((t (:inherit font-lock-string)))) + '(nxml-attribute-value-delimiter ((t (:inherit nxml-attribute-value)))) + '(nxml-attribute-prefix ((t (:inherit default)))) + '(nxml-namespace-attribute-xmlns ((t (:inherit nxml-attribute-prefix)))) + '(nxml-attribute-colon ((t (:inherit default)))) + '(nxml-namespace-attribute-colon ((t (:inherit nxml-attribute-colon)))) + + ; org + '(org-agenda-date-today ((t (:foreground "white" :slant italic :weight bold))) t) + '(org-agenda-structure ((t (:inherit font-lock-comment-face)))) '(org-archived ((t (:foreground "#8f8f8f")))) - `(org-checkbox ((t (:background ,zenburn-bg+2 :foreground "white" - :box (:line-width 1 :style released-button))))) + `(org-checkbox ((t (:background ,zenburn-bg+2 :foreground "white" :box (:line-width 1 :style released-button))))) `(org-date ((t (:foreground ,zenburn-blue :underline t)))) `(org-deadline-announce ((t (:foreground ,zenburn-red-1)))) `(org-done ((t (:bold t :weight bold :foreground ,zenburn-green+3)))) @@ -785,6 +736,7 @@ static char *gnus-pointer[] = { '(org-upcoming-deadline ((t (:inherit font-lock-keyword-face)))) `(org-warning ((t (:bold t :foreground ,zenburn-red :weight bold)))) + ; outline '(outline-8 ((t (:inherit default)))) '(outline-7 ((t (:inherit outline-8 :height 1.0)))) '(outline-6 ((t (:inherit outline-7 :height 1.0)))) @@ -794,121 +746,110 @@ static char *gnus-pointer[] = { '(outline-2 ((t (:inherit outline-3 :height 1.0)))) '(outline-1 ((t (:inherit outline-2 :height 1.0)))) + ; rcirc + '(rcirc-my-nick ((t (:inherit zenburn-primary-1)))) + '(rcirc-other-nick ((t (:inherit bold)))) + '(rcirc-bright-nick ((t (:foreground "white" :inherit rcirc-other-nick)))) + '(rcirc-dim-nick ((t (:inherit font-lock-comment)))) + '(rcirc-nick-in-message ((t (:inherit bold)))) + '(rcirc-server ((t (:inherit font-lock-comment)))) + '(rcirc-server-prefix ((t (:inherit font-lock-comment-delimiter)))) + '(rcirc-timestamp ((t (:inherit font-lock-comment)))) + '(rcirc-prompt ((t (:inherit zenburn-primary-1)))) + '(rcirc-mode-line-nick ((t (:inherit zenburn-primary-1)))) + + ; rpm + '(rpm-spec-dir ((t (:inherit zenburn-green)))) + '(rpm-spec-doc ((t (:inherit zenburn-green)))) + '(rpm-spec-ghost ((t (:inherit zenburn-red)))) + '(rpm-spec-macro ((t (:inherit zenburn-yellow)))) + '(rpm-spec-obsolete-tag ((t (:inherit zenburn-red)))) + '(rpm-spec-package ((t (:inherit zenburn-red)))) + '(rpm-spec-section ((t (:inherit zenburn-yellow)))) + '(rpm-spec-tag ((t (:inherit zenburn-blue)))) + '(rpm-spec-var ((t (:inherit zenburn-red)))) + + ; setnu '(setnu-line-number ((t (:inherit zenburn-lowlight-2)))) + ; sh + '(sh-heredoc ((t (:inherit font-lock-string)))) + + ; smerge `(smerge-mine ((t (:inherit font-lock-default-face)))) `(smerge-other ((t (:inherit font-lock-default-face)))) `(smerge-refined-change ((t (:background "#668b8b" :foreground ,zenburn-fg)))) + ; speedbar '(speedbar-button ((t (:inherit zenburn-primary-1)))) '(speedbar-file ((t (:inherit zenburn-primary-2)))) '(speedbar-directory ((t (:inherit zenburn-primary-5)))) '(speedbar-tag ((t (:inherit font-lock-function-name)))) '(speedbar-highlight ((t (:underline t)))) - '(sr-active-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-alt-marked-dir-face - ((t (:inherit zenburn-highlight-subtle :bold)))) - '(sr-alt-marked-file-face - ((t (:inherit zenburn-highlight-subtle)))) - '(sr-broken-link-face - ((t (:inherit zenburn-primary-1)))) - '(sr-clex-hotchar-face - ((t (:inherit zenburn-primary-1)))) - '(sr-compressed-face - ((t (:inherit zenburn-primary-1)))) - '(sr-directory-face - ((t (:inherit zenburn-blue)))) - '(sr-editing-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-encrypted-face - ((t (:inherit zenburn-orange)))) - '(sr-highlight-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-html-face - ((t (:inherit zenburn-green)))) - '(sr-log-face - ((t (:inherit zenburn-magenta)))) - '(sr-marked-dir-face - ((t (:inherit zenburn-highlight-alerting :bold)))) - '(sr-marked-file-face - ((t (:inherit zenburn-highlight-alerting)))) - '(sr-packaged-face - ((t (:inherit zenburn-primary-1)))) - '(sr-passive-path-face - ((t (:inherit zenburn-primary-1)))) - '(sr-symlink-directory-face - ((t (:inherit zenburn-blue)))) - '(sr-symlink-face - ((t (:inherit zenburn-blue-2)))) - '(sr-xml-face - ((t (:inherit zenburn-green-1)))) - + ; sr (sunrise commander) + '(sr-active-path-face ((t (:inherit zenburn-primary-1)))) + '(sr-alt-marked-dir-face ((t (:inherit zenburn-highlight-subtle :bold)))) + '(sr-alt-marked-file-face ((t (:inherit zenburn-highlight-subtle)))) + '(sr-broken-link-face ((t (:inherit zenburn-primary-1)))) + '(sr-clex-hotchar-face ((t (:inherit zenburn-primary-1)))) + '(sr-compressed-face ((t (:inherit zenburn-primary-1)))) + '(sr-directory-face ((t (:inherit zenburn-blue)))) + '(sr-editing-path-face ((t (:inherit zenburn-primary-1)))) + '(sr-encrypted-face ((t (:inherit zenburn-orange)))) + '(sr-highlight-path-face ((t (:inherit zenburn-primary-1)))) + '(sr-html-face ((t (:inherit zenburn-green)))) + '(sr-log-face ((t (:inherit zenburn-magenta)))) + '(sr-marked-dir-face ((t (:inherit zenburn-highlight-alerting :bold)))) + '(sr-marked-file-face ((t (:inherit zenburn-highlight-alerting)))) + '(sr-packaged-face ((t (:inherit zenburn-primary-1)))) + '(sr-passive-path-face ((t (:inherit zenburn-primary-1)))) + '(sr-symlink-directory-face ((t (:inherit zenburn-blue)))) + '(sr-symlink-face ((t (:inherit zenburn-blue-2)))) + '(sr-xml-face ((t (:inherit zenburn-green-1)))) + + ; strokes '(strokes-char ((t (:inherit font-lock-keyword)))) - '(todoo-item-header - ((t (:inherit zenburn-primary-1)))) - '(todoo-item-assigned-header - ((t (:inherit zenburn-primary-2)))) - `(todoo-sub-item-header - ((t (:foreground ,zenburn-yellow)))) - - '(tuareg-font-lock-governing - ((t (:inherit zenburn-primary-2)))) - '(tuareg-font-lock-interactive-error - ((t (:inherit font-lock-warning)))) - '(tuareg-font-lock-interactive-output - ((t (:inherit zenburn-primary-3)))) - '(tuareg-font-lock-operator - ((t (:inherit font-lock-operator)))) - - '(w3m-form-button - ((t (:inherit widget-button)))) - '(w3m-form-button-pressed - ((t (:inherit widget-button-pressed)))) - '(w3m-form-button-mouse - ((t (:inherit widget-button-pressed)))) - '(w3m-tab-unselected - ((t (:box (:line-width 1 :style released-button))))) - '(w3m-tab-selected - ((t (:box (:line-width 1 :style pressed-button))))) - '(w3m-tab-unselected-retrieving - ((t (:inherit (w3m-tab-unselected widget-inactive))))) - '(w3m-tab-selected-retrieving - ((t (:inherit (w3m-tab-selected widget-inactive))))) - '(w3m-tab-background - ((t (:inherit zenburn-highlight-subtle)))) - '(w3m-anchor - ((t (:inherit zenburn-primary-1)))) - '(w3m-arrived-anchor - ((t (:inherit zenburn-primary-2)))) - '(w3m-image - ((t (:inherit zenburn-primary-4)))) - '(w3m-form - ((t (:inherit widget-field)))) - - `(hl-line ((t (:background ,zenburn-bg-1)))) + ; svn + '(svn-mark ((t (:inherit zenburn-blue)))) - '(magit-section-title ((t (:inherit zenburn-primary-1)))) - '(magit-branch ((t (:inherit zenburn-primary-2)))) + ; todoo + '(todoo-item-header ((t (:inherit zenburn-primary-1)))) + '(todoo-item-assigned-header ((t (:inherit zenburn-primary-2)))) + `(todoo-sub-item-header ((t (:foreground ,zenburn-yellow)))) - '(flyspell-duplicate ((t (:inherit zenburn-primary-1)))) - '(flyspell-incorrect ((t (:inherit font-lock-warning)))) + ; tuareg + '(tuareg-font-lock-governing ((t (:inherit zenburn-primary-2)))) + '(tuareg-font-lock-interactive-error ((t (:inherit font-lock-warning)))) + '(tuareg-font-lock-interactive-output ((t (:inherit zenburn-primary-3)))) + '(tuareg-font-lock-operator ((t (:inherit font-lock-operator)))) - `(elscreen-tab-other-screen ((t ((:foreground ,zenburn-fg - :background ,zenburn-green-1))))) - `(elscreen-tab-current-screen ((t (:foreground ,zenburn-blue+1 - :background "#1e2320")))) + ; twitter + `(twitter-time-stamp ((t (:foreground ,zenburn-orange :background "#1e2320")))) + `(twitter-user-name ((t (:foreground "#acbc90" :background "#1e2320")))) + `(twitter-header ((t (:foreground ,zenburn-orange :background "#1e2320")))) + ; w3m + '(w3m-form-button ((t (:inherit widget-button)))) + '(w3m-form-button-pressed ((t (:inherit widget-button-pressed)))) + '(w3m-form-button-mouse ((t (:inherit widget-button-pressed)))) + '(w3m-tab-unselected ((t (:box (:line-width 1 :style released-button))))) + '(w3m-tab-selected ((t (:box (:line-width 1 :style pressed-button))))) + '(w3m-tab-unselected-retrieving ((t (:inherit (w3m-tab-unselected widget-inactive))))) + '(w3m-tab-selected-retrieving ((t (:inherit (w3m-tab-selected widget-inactive))))) + '(w3m-tab-background ((t (:inherit zenburn-highlight-subtle)))) + '(w3m-anchor ((t (:inherit zenburn-primary-1)))) + '(w3m-arrived-anchor ((t (:inherit zenburn-primary-2)))) + '(w3m-image ((t (:inherit zenburn-primary-4)))) + '(w3m-form ((t (:inherit widget-field)))) + + ; wl '(wl-highlight-message-headers ((t (:inherit zenburn-red+1)))) '(wl-highlight-message-header-contents ((t (:inherit zenburn-green)))) - '(wl-highlight-message-important-header-contents - ((t (:inherit zenburn-yellow)))) - '(wl-highlight-message-important-header-contents2 - ((t (:inherit zenburn-blue)))) - '(wl-highlight-message-unimportant-header-contents - ((t (:inherit zenburn-term-dark-gray)))) ;; reuse term + '(wl-highlight-message-important-header-contents ((t (:inherit zenburn-yellow)))) + '(wl-highlight-message-important-header-contents2 ((t (:inherit zenburn-blue)))) + '(wl-highlight-message-unimportant-header-contents ((t (:inherit zenburn-term-dark-gray)))) ;; reuse term '(wl-highlight-message-citation-header ((t (:inherit zenburn-red)))) '(wl-highlight-message-cited-text-1 ((t (:inherit zenburn-green)))) @@ -921,8 +862,7 @@ static char *gnus-pointer[] = { '(wl-highlight-summary-answered ((t (:inherit zenburn-fg)))) '(wl-highlight-summary-new ((t (:foreground "#e89393")))) - `(wl-highlight-summary-displaying ((t (:underline t - :foreground ,zenburn-yellow-2)))) + `(wl-highlight-summary-displaying ((t (:underline t :foreground ,zenburn-yellow-2)))) '(wl-highlight-thread-indent ((t (:foreground "#ecbcec")))) '(wl-highlight-summary-thread-top ((t (:foreground "#efdcbc")))) @@ -936,55 +876,6 @@ static char *gnus-pointer[] = { '(wl-highlight-folder-path ((t (:inherit zenburn-orange)))) - `(twitter-time-stamp ((t (:foreground ,zenburn-orange :background "#1e2320")))) - `(twitter-user-name ((t (:foreground "#acbc90" :background "#1e2320")))) - `(twitter-header ((t (:foreground ,zenburn-orange :background "#1e2320")))) - - '(rpm-spec-dir ((t (:inherit zenburn-green)))) - '(rpm-spec-doc ((t (:inherit zenburn-green)))) - '(rpm-spec-ghost ((t (:inherit zenburn-red)))) - '(rpm-spec-macro ((t (:inherit zenburn-yellow)))) - '(rpm-spec-obsolete-tag ((t (:inherit zenburn-red)))) - '(rpm-spec-package ((t (:inherit zenburn-red)))) - '(rpm-spec-section ((t (:inherit zenburn-yellow)))) - '(rpm-spec-tag ((t (:inherit zenburn-blue)))) - '(rpm-spec-var ((t (:inherit zenburn-red)))) - - '(mew-face-header-subject ((t (:inherit zenburn-orange)))) - '(mew-face-header-from ((t (:inherit zenburn-yellow)))) - '(mew-face-header-date ((t (:inherit zenburn-green)))) - '(mew-face-header-to ((t (:inherit zenburn-red)))) - '(mew-face-header-key ((t (:inherit zenburn-green)))) - '(mew-face-header-private ((t (:inherit zenburn-green)))) - '(mew-face-header-important ((t (:inherit zenburn-blue)))) - '(mew-face-header-marginal ((t (:inherit zenburn-term-dark-gray)))) - '(mew-face-header-warning ((t (:inherit zenburn-red)))) - '(mew-face-header-xmew ((t (:inherit zenburn-green)))) - '(mew-face-header-xmew-bad ((t (:inherit zenburn-red)))) - '(mew-face-body-url ((t (:inherit zenburn-orange)))) - '(mew-face-body-comment ((t (:inherit zenburn-term-dark-gray)))) - '(mew-face-body-cite1 ((t (:inherit zenburn-green)))) - '(mew-face-body-cite2 ((t (:inherit zenburn-blue)))) - '(mew-face-body-cite3 ((t (:inherit zenburn-orange)))) - '(mew-face-body-cite4 ((t (:inherit zenburn-yellow)))) - '(mew-face-body-cite5 ((t (:inherit zenburn-red)))) - '(mew-face-mark-review ((t (:inherit zenburn-blue)))) - '(mew-face-mark-escape ((t (:inherit zenburn-green)))) - '(mew-face-mark-delete ((t (:inherit zenburn-red)))) - '(mew-face-mark-unlink ((t (:inherit zenburn-yellow)))) - '(mew-face-mark-refile ((t (:inherit zenburn-green)))) - '(mew-face-mark-unread ((t (:inherit zenburn-red-2)))) - '(mew-face-eof-message ((t (:inherit zenburn-green)))) - '(mew-face-eof-part ((t (:inherit zenburn-yellow)))) - - '(nav-face-heading ((t (:inherit zenburn-yellow)))) - '(nav-face-button-num ((t (:inherit zenburn-cyan)))) - '(nav-face-dir ((t (:inherit zenburn-green)))) - '(nav-face-hdir ((t (:inherit zenburn-red)))) - '(nav-face-file ((t (:inherit zenburn-fg)))) - '(nav-face-hfile ((t (:inherit zenburn-red-4)))) - - '(svn-mark ((t (:inherit zenburn-blue)))) ) ;; XXX: Updating this list is very tedious. From 50577347ceff54c53bbfbd843ce59145279cb193 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 04:06:45 +0800 Subject: [PATCH 10/21] zenburn.el: remove some unneeded defvars --- zenburn.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/zenburn.el b/zenburn.el index bb2af1e..71387bd 100644 --- a/zenburn.el +++ b/zenburn.el @@ -67,9 +67,6 @@ ;; dirty fix "white"))) -(defvar font-lock-pseudo-keyword-face 'font-lock-pseudo-keyword-face) -(defvar font-lock-operator-face 'font-lock-operator-face) - (setq-default erc-mode-line-format (concat (propertize "%S" 'face (list :weight 'bold @@ -1227,7 +1224,7 @@ static char *gnus-pointer[] = { wl-highlight-summary-normal-face wl-highlight-summary-thread-top-face wl-highlight-thread-indent-face - )))) + ))))) (defalias 'zenburn #'color-theme-zenburn) From f5a35f3254830cb11f9d2597d15175bc84f19069 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Tue, 10 May 2011 04:30:29 +0800 Subject: [PATCH 11/21] zenburn.el: tidy up to stop color-theme-print from complaining --- zenburn.el | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/zenburn.el b/zenburn.el index 71387bd..403a7c4 100644 --- a/zenburn.el +++ b/zenburn.el @@ -156,6 +156,8 @@ static char *gnus-pointer[] = { '(underline ((t (:underline t)))) ;; 3. zenburn-specific faces for later :inherit + `(zenburn-foreground ((t (:foreground ,zenburn-fg)))) + `(zenburn-background-1 ((t (:background ,zenburn-bg+1)))) `(zenburn-background-2 ((t (:background ,zenburn-bg+2)))) @@ -175,6 +177,9 @@ static char *gnus-pointer[] = { `(zenburn-yellow ((t (:foreground ,zenburn-yellow)))) `(zenburn-orange ((t (:foreground ,zenburn-orange)))) `(zenburn-red ((t (:foreground ,zenburn-red)))) + `(zenburn-red-1 ((t (:foreground ,zenburn-red-1)))) + `(zenburn-red-2 ((t (:foreground ,zenburn-red-2)))) + `(zenburn-red+1 ((t (:foreground ,zenburn-red+1)))) `(zenburn-green-1 ((t (:foreground ,zenburn-green-1)))) `(zenburn-green ((t (:foreground ,zenburn-green)))) `(zenburn-green+1 ((t (:foreground ,zenburn-green+1)))) @@ -194,6 +199,7 @@ static char *gnus-pointer[] = { '(font-lock-comment ((t (:inherit zenburn-green)))) '(font-lock-comment-delimiter ((t (:inherit zenburn-lowlight-2)))) '(font-lock-constant ((t (:inherit zenburn-primary-4)))) + '(font-lock-default ((t (:inherit default)))) '(font-lock-doc ((t (:inherit zenburn-green+1)))) `(font-lock-doc-string ((t (:foreground ,zenburn-blue+1)))) `(font-lock-function-name ((t (:foreground ,zenburn-yellow)))) @@ -357,6 +363,7 @@ static char *gnus-pointer[] = { '(custom-comment ((t (:inherit font-lock-doc)))) '(custom-comment-tag ((t (:inherit font-lock-doc)))) '(custom-documentation ((t (:inherit font-lock-doc)))) + '(custom-face-tag ((t (:inherit zenburn-primary-2)))) '(custom-link ((t (:inherit zenburn-yellow :underline t)))) '(custom-tag ((t (:inherit zenburn-primary-2)))) '(custom-group-tag ((t (:inherit zenburn-primary-1)))) @@ -405,6 +412,8 @@ static char *gnus-pointer[] = { ; elscreen ;;'(elscreen-tab-current-screen ((t (:inherit zenburn-primary-1)))) + '(elscreen-tab-background ((t (:inherit zenburn-highlight-subtle)))) + '(elscreen-tab-control ((t (:inherit default)))) `(elscreen-tab-current-screen ((t (:foreground ,zenburn-blue+1 :background "#1e2320")))) ;;`(elscreen-tab-other-screen ((t ((:foreground ,zenburn-fg :background ,zenburn-green-1))))) `(elscreen-tab-other-screen ((t (:foreground ,zenburn-yellow :background ,zenburn-green)))) @@ -546,6 +555,9 @@ static char *gnus-pointer[] = { '(icompletep-nb-candidates ((t (:foreground "#AFD8AF")))) ; zenburn-green+3 '(icompletep-keys ((t (:foreground "#CC9393")))) ; zenburn-red + ; identica + '(identica-uri ((t (:inherit default)))) + ; ido '(ido-first-match ((t (:inherit zenburn-primary-1)))) '(ido-only-match ((t (:inherit zenburn-primary-2)))) @@ -656,16 +668,16 @@ static char *gnus-pointer[] = { '(minimap-active-region-background ((t (:foreground nil :background "#233323")))) ; mtorus - '(mtorus-highlight ((t (:inherit zenburn-highlight-bluish)))) + '(mtorus-highlight ((t (:inherit zenburn-highlight-subtle)))) '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1)))) ; nav '(nav-face-heading ((t (:inherit zenburn-yellow)))) - '(nav-face-button-num ((t (:inherit zenburn-cyan)))) + `(nav-face-button-num ((t (:foreground ,zenburn-cyan)))) '(nav-face-dir ((t (:inherit zenburn-green)))) '(nav-face-hdir ((t (:inherit zenburn-red)))) - '(nav-face-file ((t (:inherit zenburn-fg)))) - '(nav-face-hfile ((t (:inherit zenburn-red-4)))) + '(nav-face-file ((t (:inherit zenburn-foreground)))) + `(nav-face-hfile ((t (:foreground ,zenburn-red-4)))) ; nxml '(nxml-delimited-data ((t (:inherit font-lock-string)))) @@ -773,8 +785,8 @@ static char *gnus-pointer[] = { '(sh-heredoc ((t (:inherit font-lock-string)))) ; smerge - `(smerge-mine ((t (:inherit font-lock-default-face)))) - `(smerge-other ((t (:inherit font-lock-default-face)))) + `(smerge-mine ((t (:inherit font-lock-default)))) + `(smerge-other ((t (:inherit font-lock-default)))) `(smerge-refined-change ((t (:background "#668b8b" :foreground ,zenburn-fg)))) ; speedbar @@ -856,7 +868,7 @@ static char *gnus-pointer[] = { '(wl-highlight-message-signature ((t (:inherit zenburn-yellow)))) - '(wl-highlight-summary-answered ((t (:inherit zenburn-fg)))) + '(wl-highlight-summary-answered ((t (:inherit zenburn-foreground)))) '(wl-highlight-summary-new ((t (:foreground "#e89393")))) `(wl-highlight-summary-displaying ((t (:underline t :foreground ,zenburn-yellow-2)))) @@ -864,9 +876,9 @@ static char *gnus-pointer[] = { '(wl-highlight-thread-indent ((t (:foreground "#ecbcec")))) '(wl-highlight-summary-thread-top ((t (:foreground "#efdcbc")))) - '(wl-highlight-summary-normal ((t (:inherit zenburn-fg)))) + '(wl-highlight-summary-normal ((t (:inherit zenburn-foreground)))) - '(wl-highlight-folder-zero ((t (:inherit zenburn-fg)))) + '(wl-highlight-folder-zero ((t (:inherit zenburn-foreground)))) '(wl-highlight-folder-few ((t (:inherit zenburn-red+1)))) '(wl-highlight-folder-many ((t (:inherit zenburn-red+1)))) '(wl-highlight-folder-unread ((t (:foreground "#e89393")))) From 1ec010b78ec4bb6714ddbf360ab7d69264b1a1c2 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Thu, 12 May 2011 10:16:28 +0800 Subject: [PATCH 12/21] zenburn.el: index color defs at the top for readbility --- zenburn.el | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/zenburn.el b/zenburn.el index 403a7c4..f7a5f37 100644 --- a/zenburn.el +++ b/zenburn.el @@ -25,38 +25,38 @@ (require 'color-theme) -(defvar zenburn-fg "#dcdccc") - -(defvar zenburn-bg-1 "#2b2b2b") -(defvar zenburn-bg "#3f3f3f") -(defvar zenburn-bg+1 "#4f4f4f") -(defvar zenburn-bg+2 "#5f5f5f") -(defvar zenburn-red+1 "#dca3a3") -(defvar zenburn-red "#cc9393") -(defvar zenburn-red-1 "#bc8383") -(defvar zenburn-red-2 "#ac7373") -(defvar zenburn-red-3 "#9c6363") -(defvar zenburn-red-4 "#8c5353") -(defvar zenburn-orange "#dfaf8f") -(defvar zenburn-orange+1 "#ffc9a4") -(defvar zenburn-yellow "#f0dfaf") -(defvar zenburn-yellow-1 "#e0cf9f") -(defvar zenburn-yellow-2 "#d0bf8f") -(defvar zenburn-green-1 "#5f7f5f") -(defvar zenburn-green "#7f9f7f") -(defvar zenburn-green+1 "#8fb28f") -(defvar zenburn-green+2 "#9fc59f") -(defvar zenburn-green+3 "#afd8af") -(defvar zenburn-green+4 "#bfebbf") -(defvar zenburn-cyan "#93e0e3") -(defvar zenburn-blue+1 "#94bff3") -(defvar zenburn-blue "#8cd0d3") -(defvar zenburn-blue-1 "#7cb8bb") -(defvar zenburn-blue-2 "#6ca0a3") -(defvar zenburn-blue-3 "#5c888b") -(defvar zenburn-blue-4 "#4c7073") -(defvar zenburn-blue-5 "#366060") -(defvar zenburn-magenta "#dc8cc3") +(defvar zenburn-fg "#dcdccc") + +(defvar zenburn-bg-1 "#2b2b2b") +(defvar zenburn-bg "#3f3f3f") +(defvar zenburn-bg+1 "#4f4f4f") +(defvar zenburn-bg+2 "#5f5f5f") +(defvar zenburn-red+1 "#dca3a3") +(defvar zenburn-red "#cc9393") +(defvar zenburn-red-1 "#bc8383") +(defvar zenburn-red-2 "#ac7373") +(defvar zenburn-red-3 "#9c6363") +(defvar zenburn-red-4 "#8c5353") +(defvar zenburn-orange "#dfaf8f") +(defvar zenburn-orange+1 "#ffc9a4") +(defvar zenburn-yellow "#f0dfaf") +(defvar zenburn-yellow-1 "#e0cf9f") +(defvar zenburn-yellow-2 "#d0bf8f") +(defvar zenburn-green-1 "#5f7f5f") +(defvar zenburn-green "#7f9f7f") +(defvar zenburn-green+1 "#8fb28f") +(defvar zenburn-green+2 "#9fc59f") +(defvar zenburn-green+3 "#afd8af") +(defvar zenburn-green+4 "#bfebbf") +(defvar zenburn-cyan "#93e0e3") +(defvar zenburn-blue+1 "#94bff3") +(defvar zenburn-blue "#8cd0d3") +(defvar zenburn-blue-1 "#7cb8bb") +(defvar zenburn-blue-2 "#6ca0a3") +(defvar zenburn-blue-3 "#5c888b") +(defvar zenburn-blue-4 "#4c7073") +(defvar zenburn-blue-5 "#366060") +(defvar zenburn-magenta "#dc8cc3") (eval-after-load 'term '(setq ansi-term-color-vector From 21880ff0db610bbe0fa8f54bd2837b8bc75edd98 Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Sat, 21 May 2011 03:02:46 +0800 Subject: [PATCH 13/21] import rainbow-delimiters from djcb's emacs-24 zenburn theme --- zenburn.el | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/zenburn.el b/zenburn.el index f7a5f37..a1c46ab 100644 --- a/zenburn.el +++ b/zenburn.el @@ -755,6 +755,20 @@ static char *gnus-pointer[] = { '(outline-2 ((t (:inherit outline-3 :height 1.0)))) '(outline-1 ((t (:inherit outline-2 :height 1.0)))) + ; rainbow-delimiters + `(rainbow-delimiters-depth-1-face ((t (:foreground ,zenburn-cyan)))) + `(rainbow-delimiters-depth-2-face ((t (:foreground ,zenburn-yellow)))) + `(rainbow-delimiters-depth-3-face ((t (:foreground ,zenburn-blue+1)))) + `(rainbow-delimiters-depth-4-face ((t (:foreground ,zenburn-red+1)))) + `(rainbow-delimiters-depth-5-face ((t (:foreground ,zenburn-orange)))) + `(rainbow-delimiters-depth-6-face ((t (:foreground ,zenburn-blue-1)))) + `(rainbow-delimiters-depth-7-face ((t (:foreground ,zenburn-green+4)))) + `(rainbow-delimiters-depth-8-face ((t (:foreground ,zenburn-red-3)))) + `(rainbow-delimiters-depth-9-face ((t (:foreground ,zenburn-yellow-2)))) + `(rainbow-delimiters-depth-10-face ((t (:foreground ,zenburn-green+2)))) + `(rainbow-delimiters-depth-11-face ((t (:foreground ,zenburn-blue+1)))) + `(rainbow-delimiters-depth-12-face ((t (:foreground ,zenburn-red-4)))) + ; rcirc '(rcirc-my-nick ((t (:inherit zenburn-primary-1)))) '(rcirc-other-nick ((t (:inherit bold)))) From 164e68b02c9e92173c0314ee47b4179850d997ce Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sat, 18 Jun 2011 09:55:05 -0400 Subject: [PATCH 14/21] Slightly highlight background of cited text Provides useful visual separation when you read messages from people who don't separate cited text from their reply by a blank line. (cherry picked from commit d22802c6435651b3de99565e638fabd6fa62e090) Conflicts: zenburn.el --- zenburn.el | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/zenburn.el b/zenburn.el index a1c46ab..b0ad67b 100644 --- a/zenburn.el +++ b/zenburn.el @@ -195,6 +195,9 @@ static char *gnus-pointer[] = { '(zenburn-title ((t (:inherit variable-pitch :weight bold)))) + `(zenburn-citation ((t (:background ,zenburn-bg+1)))) + + '(font-lock-builtin ((t (:inherit zenburn-blue)))) '(font-lock-comment ((t (:inherit zenburn-green)))) '(font-lock-comment-delimiter ((t (:inherit zenburn-lowlight-2)))) @@ -469,17 +472,17 @@ static char *gnus-pointer[] = { `(gnus-x-face ((t (:background ,zenburn-fg :foreground ,zenburn-bg)))) - `(gnus-cite-1 ((t (:foreground ,zenburn-blue)))) - `(gnus-cite-2 ((t (:foreground ,zenburn-blue-1)))) - `(gnus-cite-3 ((t (:foreground ,zenburn-blue-2)))) - `(gnus-cite-4 ((t (:foreground ,zenburn-green+2)))) - `(gnus-cite-5 ((t (:foreground ,zenburn-green+1)))) - `(gnus-cite-6 ((t (:foreground ,zenburn-green)))) - `(gnus-cite-7 ((t (:foreground ,zenburn-red)))) - `(gnus-cite-8 ((t (:foreground ,zenburn-red-1)))) - `(gnus-cite-9 ((t (:foreground ,zenburn-red-2)))) - `(gnus-cite-10 ((t (:foreground ,zenburn-yellow-1)))) - `(gnus-cite-11 ((t (:foreground ,zenburn-yellow)))) + `(gnus-cite-1 ((t (:foreground ,zenburn-blue :inherit zenburn-citation)))) + `(gnus-cite-2 ((t (:foreground ,zenburn-blue-1 :inherit zenburn-citation)))) + `(gnus-cite-3 ((t (:foreground ,zenburn-blue-2 :inherit zenburn-citation)))) + `(gnus-cite-4 ((t (:foreground ,zenburn-green+2 :inherit zenburn-citation)))) + `(gnus-cite-5 ((t (:foreground ,zenburn-green+1 :inherit zenburn-citation)))) + `(gnus-cite-6 ((t (:foreground ,zenburn-green :inherit zenburn-citation)))) + `(gnus-cite-7 ((t (:foreground ,zenburn-red :inherit zenburn-citation)))) + `(gnus-cite-8 ((t (:foreground ,zenburn-red-1 :inherit zenburn-citation)))) + `(gnus-cite-9 ((t (:foreground ,zenburn-red-2 :inherit zenburn-citation)))) + `(gnus-cite-10 ((t (:foreground ,zenburn-yellow-1 :inherit zenburn-citation)))) + `(gnus-cite-11 ((t (:foreground ,zenburn-yellow :inherit zenburn-citation)))) `(gnus-group-news-1-empty ((t (:foreground ,zenburn-yellow)))) `(gnus-group-news-2-empty ((t (:foreground ,zenburn-green+3)))) @@ -624,7 +627,7 @@ static char *gnus-pointer[] = { '(makefile-shell ((t (nil)))) ; message - '(message-cited-text ((t (:inherit font-lock-comment)))) + `(message-cited-text ((t (:inherit (zenburn-citation font-lock-comment))))) '(message-header-name ((t (:inherit zenburn-green+1)))) '(message-header-other ((t (:inherit zenburn-green)))) '(message-header-to ((t (:inherit zenburn-primary-1)))) From 2a62ea6efe363342dea4a32882c7c7eaad59fd86 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Sun, 19 Jun 2011 05:51:43 -0700 Subject: [PATCH 15/21] Merge pull request #5 from dabrahams/volatile/cite-bg Slightly highlight background of cited text (cherry picked from commit 7e1b172ab88a7e5ce64282df7f8a9175d3bd681f) (history-clarifying commit only; no code changes because effect is already in the branch) From 9b88034f46ef92980cdb0f9321149d87f2d502c8 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Sun, 28 Aug 2011 01:41:50 -0700 Subject: [PATCH 16/21] Merge pull request #9 from dabrahams/volatile/widgets Better face for inactive widgets (cherry picked from commit 9353ab4c4adbf81dd5584452467379e5b9baccd6) --- zenburn.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenburn.el b/zenburn.el index b0ad67b..b2af50f 100644 --- a/zenburn.el +++ b/zenburn.el @@ -253,7 +253,7 @@ static char *gnus-pointer[] = { '(plain-widget-button-pressed ((t (:inverse-video t)))) '(plain-widget-documentation ((t (:inherit font-lock-doc)))) `(plain-widget-field ((t (:background ,zenburn-bg+2)))) - '(plain-widget-inactive ((t (:strike-through t)))) + '(plain-widget-inactive ((t (:inherit zenburn-term-dark-gray)))) `(plain-widget-single-line-field ((t (:background ,zenburn-bg+2)))) `(fancy-widget-button ((t (:background ,zenburn-bg+1 :box (:line-width 2 :style released-button))))) @@ -262,7 +262,7 @@ static char *gnus-pointer[] = { `(fancy-widget-button-pressed-highlight ((t (:background ,zenburn-bg+1 :box (:line-width 2 :style pressed-button))))) '(fancy-widget-documentation ((t (:inherit font-lock-doc)))) `(fancy-widget-field ((t (:background ,zenburn-bg+2)))) - '(fancy-widget-inactive ((t (:strike-through t)))) + '(fancy-widget-inactive ((t (:inherit zenburn-term-dark-gray)))) `(fancy-widget-single-line-field ((t (:background ,zenburn-bg+2)))) '(widget-button ((t (:inherit plain-widget-button)))) From c73118f747fb332e3e244c3e71275e74bebec86d Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Wed, 7 Sep 2011 20:59:50 +0200 Subject: [PATCH 17/21] Remove references to nonexistent `zenburn-foreground' (thanks @dabrahams). (cherry picked from commit 2e44e58b951bd285583fc773ef1c681e44b31160) (we already had zenburn-foreground so just keep using it) From c545ccdf615d3acf01f3d282bbba9b1bbf8e7894 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Wed, 7 Sep 2011 21:00:56 +0200 Subject: [PATCH 18/21] Remove theming of defunct `mtorus' package. (cherry picked from commit 2c8090b4c324d9d2b7a5b39050c194b5ff4ba46a) --- zenburn.el | 4 ---- 1 file changed, 4 deletions(-) diff --git a/zenburn.el b/zenburn.el index b2af50f..e1e9862 100644 --- a/zenburn.el +++ b/zenburn.el @@ -670,10 +670,6 @@ static char *gnus-pointer[] = { ; minimap '(minimap-active-region-background ((t (:foreground nil :background "#233323")))) - ; mtorus - '(mtorus-highlight ((t (:inherit zenburn-highlight-subtle)))) - '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1)))) - ; nav '(nav-face-heading ((t (:inherit zenburn-yellow)))) `(nav-face-button-num ((t (:foreground ,zenburn-cyan)))) From f122959796d6a397440188b4216370b403a1f8eb Mon Sep 17 00:00:00 2001 From: Martin Dengler Date: Fri, 2 Mar 2012 14:35:13 +0800 Subject: [PATCH 19/21] ...finish removal of mtorus package --- zenburn.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/zenburn.el b/zenburn.el index e1e9862..f027c7a 100644 --- a/zenburn.el +++ b/zenburn.el @@ -1091,8 +1091,6 @@ static char *gnus-pointer[] = { message-header-xheader-face message-mml-face message-separator-face - mtorus-highlight-face - mtorus-notify-highlight-face nxml-attribute-colon-face nxml-attribute-local-name-face nxml-attribute-prefix-face From 0e5555d522177f5f170b94b2ecf3b37e5feaabbc Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Mon, 3 Oct 2011 14:46:11 -0400 Subject: [PATCH 20/21] Avoid making redundant pseudo-obsolete-face aliases via inheritance This was causing color-theme-select to recurse infinitely when trying to resolve the inheritance. Fixes #13 (cherry picked from commit a942799d6a9fe1ba367135b504a92c7c92ae1f84) --- zenburn.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/zenburn.el b/zenburn.el index f027c7a..3dda521 100644 --- a/zenburn.el +++ b/zenburn.el @@ -25,6 +25,10 @@ (require 'color-theme) +(require 'cus-edit) ;; for custom-face-tag-face et. al +(require 'org-faces) ;; for org faces in alias clause + + (defvar zenburn-fg "#dcdccc") (defvar zenburn-bg-1 "#2b2b2b") @@ -104,10 +108,12 @@ static char *gnus-pointer[] = { (error "Invalid face alias: %s" alias-name) (let ((target-name (replace-regexp-in-string ".*\\(-face\\)" "" - alias-name nil nil 1))) - (push `(,(intern alias-name) - ((t (:inherit ,(intern target-name))))) - clauses))))))) + alias-name nil nil 1)) + (alias (intern alias-name))) + (unless (get alias 'face-alias) + (push `(,(intern alias-name) + ((t (:inherit ,(intern target-name))))) + clauses)))))))) ;;;###autoload (defun color-theme-zenburn () From 630f48d7b82111da8eca6a4caa887a1a734c4ed3 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 28 Jul 2011 23:40:46 -0400 Subject: [PATCH 21/21] A brown cursor shows up better Conflicts: zenburn.el --- zenburn.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zenburn.el b/zenburn.el index 3dda521..342c555 100644 --- a/zenburn.el +++ b/zenburn.el @@ -311,7 +311,8 @@ static char *gnus-pointer[] = { `(button ((t (:foreground ,zenburn-yellow :underline t)))) - `(cursor ((t (:background "#aaaaaa" :foreground nil)))) + `(cursor ((t (:background "brown" :foreground ,zenburn-bg)))) + '(hover-highlight ((t (:underline t :foreground "#f8f893")))) '(menu ((t nil))) '(mouse ((t (:inherit zenburn-foreground))))