minor changes

2 files changed, 16 insertions, 22 deletions

diff --git a/color-theme-zenburn.el b/color-theme-zenburn.el
index 40fc0b7..ad0a80b 100644
--- a/color-theme-zenburn.el
+++ b/color-theme-zenburn.el
@@ -295,6 +295,20 @@
      (ido-only-match ((t (:inherit zenburn-strong-2-face))))
      (ido-subdir ((t (:foreground ,zenburn-yellow))))
 
+     (js2-warning-face ((t (:underline ,zenburn-orange))))
+     (js2-error-face ((t (:inherit zenburn-error-face))))
+     (js2-jsdoc-tag-face ((t (:foreground ,zenburn-green-1))))
+     (js2-jsdoc-type-face ((t (:foreground ,zenburn-green+2))))
+     (js2-jsdoc-value-face ((t (:foreground ,zenburn-green+3))))
+     (js2-function-param-face ((t (:foreground, zenburn-green+3))))
+     ;(js2-instance-member-face)
+     ;(js2-private-member-face)
+     ;(js2-private-function-call-face)
+     ;(js2-jsdoc-html-tag-name-face)
+     ;(js2-jsdoc-html-tag-delimiter-face)
+     ;(js2-magic-paren-face)
+     (js2-external-variable-face ((t (:foreground ,zenburn-orange))))
+
      ;; linum-mode
      (linum ((t (:foreground ,zenburn-fg-1 :background ,zenburn-bg-1))))
 
@@ -451,21 +465,7 @@
      (wl-highlight-summary-thread-top-face ((t (:foreground ,zenburn-yellow))))
      (wl-highlight-thread-indent-face ((t (:foreground ,zenburn-magenta))))
      (wl-highlight-summary-refiled-face ((t (:foreground ,zenburn-fg))))
-     (wl-highlight-summary-displaying-face ((t (:underline t :weight bold))))
-
-     (js2-warning-face ((t (:underline ,zenburn-orange))))
-     (js2-error-face ((t (:inherit zenburn-error-face))))
-     (js2-jsdoc-tag-face ((t (:foreground ,zenburn-green-1))))
-     (js2-jsdoc-type-face ((t (:foreground ,zenburn-green+2))))
-     (js2-jsdoc-value-face ((t (:foreground ,zenburn-green+3))))
-     (js2-function-param-face ((t (:foreground, zenburn-green+3))))
-     ;(js2-instance-member-face)
-     ;(js2-private-member-face)
-     ;(js2-private-function-call-face)
-     ;(js2-jsdoc-html-tag-name-face)
-     ;(js2-jsdoc-html-tag-delimiter-face)
-     ;(js2-magic-paren-face)
-     (js2-external-variable-face ((t (:foreground ,zenburn-orange)))))))
+     (wl-highlight-summary-displaying-face ((t (:underline t :weight bold)))))))
 
 (add-to-list 'color-themes '(color-theme-zenburn
                              "Zenburn"
diff --git a/zenburn-theme.el b/zenburn-theme.el
index 5395d28..9dd7d03 100644
--- a/zenburn-theme.el
+++ b/zenburn-theme.el
@@ -87,12 +87,6 @@
    `(link ((,class (:foreground ,zenburn-yellow :underline t :weight bold))))
    `(link-visited ((,class (:foreground ,zenburn-yellow-2 :underline t :weight normal))))
 
-   ;;; define some reusable zenburn faces that we can inherit from afterwards
-   `(zenburn-strong-1-face ((,class (:foreground ,zenburn-yellow :weight bold))))
-   `(zenburn-strong-2-face ((,class (:foreground ,zenburn-orange :weight bold))))
-   `(zenburn-warning-face ((,class (:foreground ,zenburn-yellow-1 :weight bold :underline t))))
-   `(zenburn-error-face ((,class (:foreground ,zenburn-red-1 :weight bold :underline t))))
-
    ;;; basic coloring
    `(default ((,class (:foreground ,zenburn-fg :background ,zenburn-bg))))
    `(cursor ((,class (:foreground ,zenburn-fg))))
@@ -456,7 +450,7 @@
    `(wl-highlight-thread-indent-face ((,class (:foreground ,zenburn-magenta))))
    `(wl-highlight-summary-refiled-face ((,class (:foreground ,zenburn-fg))))
    `(wl-highlight-summary-displaying-face ((,class (:underline t :weight bold))))
-   
+
    ;; which-func-mode
    `(which-func ((,class (:foreground ,zenburn-green+1))))))