merge trunk

5 files changed, 8 insertions, 4 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5e80b5029ff..f2098dc210d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * themes/dichromacy-theme.el:
+        * themes/tango-theme.el:
+        * themes/tango-dark-theme.el:
+        * themes/wheatgrass-theme.el: Don't define button face separately;
+        it inherits from link now.
+
 2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * NEWS: Clarify that `smtpmail-starttls-credentials' doesn't exist.
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index 0105080ab08..31f27d9fb8a 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -72,7 +72,6 @@ Ansi-Color faces are included.")
    `(font-lock-warning-face ((,class (:weight bold :slant italic
                                       :foreground ,vermillion))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue))))
    `(link ((,class (:underline t :foreground ,blue))))
    `(link-visited ((,class (:underline t :foreground ,redpurple))))
    ;; Gnus faces
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index b5621d10320..403370c90cb 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -86,7 +86,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-variable-name-face ((,class (:foreground ,orange-1))))
    `(font-lock-warning-face ((,class (:foreground ,red-0))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue-1))))
    `(link ((,class (:underline t :foreground ,blue-1))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
    ;; Gnus faces
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index c58e0036353..9d0f0aca94a 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -77,7 +77,6 @@ Semantic, and Ansi-Color faces are included.")
    `(font-lock-variable-name-face ((,class (:foreground ,orange-4))))
    `(font-lock-warning-face ((,class (:foreground ,red-2))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground ,blue-3))))
    `(link ((,class (:underline t :foreground ,blue-3))))
    `(link-visited ((,class (:underline t :foreground ,blue-2))))
    ;; Gnus faces
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 3a08bb63d96..9f8772c4d6e 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -47,7 +47,6 @@ of green, brown, and blue.")
    `(font-lock-variable-name-face ((,class (:foreground "yellow green"))))
    `(font-lock-warning-face ((,class (:foreground "salmon1"))))
    ;; Button and link faces
-   `(button ((,class (:underline t :foreground "cyan"))))
    `(link ((,class (:underline t :foreground "cyan"))))
    `(link-visited ((,class (:underline t :foreground "dark cyan"))))
    ;; Gnus faces