From bb626fb87996c6935f96447980f696b2e118c38a Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 1 Feb 2013 08:45:32 +0100 Subject: Use unspecified, check unwanted properties - Use `unspecified' instead of `nil' to represent empty options, hopefully this allows for better cooperation with themes loaded after this one. - Specify any face properties that come from the face definitions that we don't want to use as `unspecified'. - Change `diff-hl-*' to have a different foreground and background color, the effect created before this should be reproducible by setting `diff-hl-draw-borders' to nil. --- yoshi-theme.el | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'yoshi-theme.el') diff --git a/yoshi-theme.el b/yoshi-theme.el index 68cc401..76cbe2b 100644 --- a/yoshi-theme.el +++ b/yoshi-theme.el @@ -33,31 +33,31 @@ 'yoshi '(default ((t (:background "#111113" :foreground "#eeeeec")))) - '(diff-hl-change ((t (:background "#cfce29" :foreground "#cfce29")))) - '(diff-hl-delete ((t (:background "#e09591" :foreground "#e09591")))) - '(diff-hl-insert ((t (:background "#9ad870" :foreground "#9ad870")))) - '(flycheck-error-face ((t (:foreground nil :underline (:color "#e09591" :style wave))))) - '(flycheck-warning-face ((t (:foreground nil :underline (:color "#ffbb56" :style wave))))) - '(flymake-errline ((t (:background nil :underline (:color "#e09591" :style wave))))) - '(flymake-infoline ((t (:background nil :underline (:color "#78a2c1" :style wave))))) - '(flymake-warnline ((t (:background nil :underline (:color "#ffbb56" :style wave))))) - '(flyspell-duplicate ((t (:foreground nil :underline (:color "#ffbb56" :style wave))))) - '(flyspell-incorrect ((t (:foreground nil :underline (:color "#e09591" :style wave))))) - '(font-lock-comment-delimiter-face ((t (:foreground "#999999" :slant italic :weight bold)))) + '(diff-hl-change ((t (:background "#835c0e" :foreground "#ffbb56")))) + '(diff-hl-delete ((t (:background "#973732" :foreground "#e98591" :inherit unspecified)))) + '(diff-hl-insert ((t (:background "#405c2e" :foreground "#9ad870" :inherit unspecified)))) + '(flycheck-error-face ((t (:inherit unspecified :underline (:color "#e09591" :style wave))))) + '(flycheck-warning-face ((t (:inherit unspecified :underline (:color "#ffbb56" :style wave))))) + '(flymake-errline ((t (:background unspecified :underline (:color "#e09591" :style wave))))) + '(flymake-infoline ((t (:background unspecified :underline (:color "#78a2c1" :style wave))))) + '(flymake-warnline ((t (:background unspecified :underline (:color "#ffbb56" :style wave))))) + '(flyspell-duplicate ((t (:inherit unspecified :underline (:color "#ffbb56" :style wave))))) + '(flyspell-incorrect ((t (:inherit unspecified :underline (:color "#e09591" :style wave))))) + '(font-lock-comment-delimiter-face ((t (:foreground "#999999" :slant italic :weight bold :inherit unspecified)))) '(font-lock-comment-face ((t (:foreground "#a9a9a9" :slant italic)))) '(font-lock-constant-face ((t (:foreground "#93d8d8")))) - '(font-lock-doc-face ((t (:foreground "#9ad870")))) + '(font-lock-doc-face ((t (:foreground "#9ad870" :inherit unspecified)))) '(font-lock-function-name-face ((t (:foreground "#c39cc3")))) '(font-lock-keyword-face ((t (:foreground "#cfce29")))) '(font-lock-string-face ((t (:foreground "#ffbd5c")))) '(font-lock-type-face ((t (:foreground "#78a2c1" :weight bold)))) '(font-lock-variable-name-face ((t (:foreground "#e09591")))) - '(font-lock-warning-face ((t (:foreground "#ff9800")))) + '(font-lock-warning-face ((t (:foreground "#ff9800" :inherit unspecified)))) '(highlight ((t (:background "#171719")))) - '(highlight-80+ ((t (:underline (:color "#e09591" :style wave) :background nil)))) + '(highlight-80+ ((t (:underline (:color "#e09591" :style wave) :background unspecified)))) '(identica-stripe-face ((t (:background "#222224")))) '(identica-uri-face ((t (:foreground "#ffbb56" :underline t)))) - '(identica-username-face ((t (:foreground "#78a2c1" :weight bold :underline nil)))) + '(identica-username-face ((t (:foreground "#78a2c1" :weight bold :underline unspecified)))) '(ido-subdir ((t (:foreground "#e09591")))) '(italic ((t (:slant italic)))) '(jabber-chat-prompt-foreign ((t (:foreground "#e09591")))) @@ -67,7 +67,7 @@ '(jabber-roster-user-online ((t (:foreground "#769ff2")))) '(link ((t (:foreground "#ffbb56" :underline t)))) '(link-visited ((t (:foreground "#ee82ee" :underline t)))) - '(magit-item-highlight ((t (:weight bold :background nil)))) + '(magit-item-highlight ((t (:weight bold :inherit unspecified)))) '(markdown-header-face-1 ((t (:foreground "#78a2c1")))) '(markdown-header-face-2 ((t (:foreground "#93d8d8")))) '(markdown-header-face-3 ((t (:foreground "#9ad870")))) @@ -75,8 +75,8 @@ '(markdown-header-face-5 ((t (:foreground "#e09591")))) '(markdown-header-face-6 ((t (:foreground "#a9a9a9")))) '(minibuffer-prompt ((t (:foreground "#78a2c1")))) - '(mode-line ((t (:background "#222224" :foreground "#eeeeec" :box nil)))) - '(mode-line-inactive ((t (:background "#171719" :foreground "#999999" :box nil)))) + '(mode-line ((t (:background "#222224" :foreground "#eeeeec" :box unspecified)))) + '(mode-line-inactive ((t (:weight normal :background "#171719" :foreground "#999999" :box unspecified :inherit unspecified)))) '(org-agenda-calendar-sexp ((t (:foreground "#cfce29")))) '(org-agenda-current-time ((t (:foreground "#ff9800" :weight bold)))) '(org-agenda-date ((t (:foreground "#63a0a0")))) @@ -99,17 +99,17 @@ '(org-scheduled-previously ((t (:foreground "#e09591" :bold t)))) '(org-scheduled-today ((t (:foreground "#ffbb56" :underline t)))) '(org-time-grid ((t (:foreground "#ffbb56")))) - '(pp^L-highlight ((t (:box nil :foreground "#555557")))) + '(pp^L-highlight ((t (:box unspecified :foreground "#555557")))) '(region ((t (:background "#2729b6")))) - '(rst-level-1 ((t (:background nil)))) - '(rst-level-2 ((t (:background nil)))) - '(rst-level-3 ((t (:background nil)))) - '(rst-level-4 ((t (:background nil)))) - '(rst-level-5 ((t (:background nil)))) - '(rst-level-6 ((t (:background nil)))) + '(rst-level-1 ((t (:background unspecified)))) + '(rst-level-2 ((t (:background unspecified)))) + '(rst-level-3 ((t (:background unspecified)))) + '(rst-level-4 ((t (:background unspecified)))) + '(rst-level-5 ((t (:background unspecified)))) + '(rst-level-6 ((t (:background unspecified)))) '(sh-heredoc ((t (:foreground "#ffbb56")))) '(show-paren-match ((t (:background "#555557" :weight bold)))) - '(show-paren-mismatch ((t (:background nil :foreground "#e09591")))) + '(show-paren-mismatch ((t (:background unspecified :foreground "#e09591")))) '(slime-repl-input-face ((t (:foreground "#828281")))) '(slime-repl-inputed-output-face ((t (:foreground "#a5a5a4")))) '(slime-repl-output-face ((t (:foreground "#eeeeec")))) -- cgit v1.2.3-54-g00ecf