# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # target_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/ # testament_sha1: 80c27b00e72ef8f21c25987d9f6a16245712a952 # timestamp: 2010-10-27 09:29:50 +0200 # base_revision_id: address@hidden # # Begin patch === modified file 'ChangeLog' --- ChangeLog 2010-10-25 17:23:45 +0000 +++ ChangeLog 2010-10-27 07:29:21 +0000 @@ -1,3 +1,12 @@ +2010-10-27 Jan Moringen + + * etc/themes/tango-dark-theme.el: Use color definitions from + tango-colors.el. New faces for smerge, ediff, flyspell, semantic + and outline + * etc/themes/tango-theme.el: likewise + * lisp/emacs-lisp/tango-colors.el: New file containing color + definitions of the Tango theme + 2010-10-25 Andreas Schwab * configure.in (checking for -znocombreloc): Use AC_LANG_PROGRAM === modified file 'etc/themes/tango-dark-theme.el' --- etc/themes/tango-dark-theme.el 2010-10-12 20:06:20 +0000 +++ etc/themes/tango-dark-theme.el 2010-10-27 07:29:21 +0000 @@ -19,69 +19,124 @@ ;;; Commentary -;; The colors in this theme come from the Tango palette, which is in -;; the public domain: http://tango.freedesktop.org/ +;; This theme uses the Tango color palette, which is in the public +;; domain: http://tango.freedesktop.org/. Color definitions can be +;; found tango-colors.el. ;;; Code: +(require 'tango-colors) + (deftheme tango-dark "Theme for faces, based on the Tango palette on a dark background. Basic, Font Lock, Isearch, Gnus, and Message faces are included.") (custom-theme-set-faces 'tango-dark - '(default ((t (:foreground "#eeeeec" :background "#2e3436")))) - '(cursor ((t (:foreground "#2e3436" :background "#fce94f")))) - '(highlight ((t (:foreground "#2e3436" :background "#edd400")))) - '(region ((t (:background "#555753")))) - '(font-lock-builtin-face ((t (:foreground "#ad7fa8")))) - '(font-lock-comment-face ((t (:foreground "#73d216")))) - '(font-lock-constant-face ((t (:foreground "#e6a8df")))) - '(font-lock-function-name-face ((t (:foreground "#fce94f")))) - '(font-lock-keyword-face ((t (:foreground "#8cc4ff")))) - '(font-lock-string-face ((t (:foreground "#e9b96e")))) - '(font-lock-type-face ((t (:foreground "#a5ff4d")))) - '(font-lock-variable-name-face ((t (:foreground "#fcaf3e")))) - '(font-lock-warning-face ((t (:foreground "#ef2929")))) - '(button ((t (:underline t :foreground "#729fcf")))) - '(link ((t (:underline t :foreground "#729fcf")))) - '(link-visited ((t (:underline t :foreground "#3465a4")))) - '(mode-line ((t (:box (:line-width -1 :style released-button) - :background "#d3d7cf" :foreground "black")))) - '(mode-line-inactive ((t (:box (:line-width -1 :style released-button) - :background "#555753" :foreground "white")))) - '(isearch ((t (:foreground "#ffffff" :background "#ce5c00")))) - '(lazy-highlight ((t (:background "#8f5902")))) - '(gnus-group-news-1 ((t (:foreground "#ad7fa8")))) - '(gnus-group-news-1-low ((t (:foreground "#75507b")))) - '(gnus-group-news-2 ((t (:foreground "#729fcf")))) - '(gnus-group-news-2-low ((t (:foreground "#3465a4")))) - '(gnus-group-news-3 ((t (:foreground "#8ae234")))) - '(gnus-group-news-3-low ((t (:foreground "#73d216")))) - '(gnus-group-news-4 ((t (:foreground "#e9b9e6")))) - '(gnus-group-news-4-low ((t (:foreground "#c17d11")))) - '(gnus-group-news-5 ((t (:foreground "#fcaf3e")))) - '(gnus-group-news-5-low ((t (:foreground "#f57900")))) - '(gnus-group-news-low ((t (:foreground "#edd400")))) - '(gnus-group-mail-1 ((t (:foreground "#ad7fa8")))) - '(gnus-group-mail-1-low ((t (:foreground "#75507b")))) - '(gnus-group-mail-2 ((t (:foreground "#729fcf")))) - '(gnus-group-mail-2-low ((t (:foreground "#3465a4")))) - '(gnus-group-mail-3 ((t (:foreground "#8ae234")))) - '(gnus-group-mail-3-low ((t (:foreground "#73d216")))) - '(gnus-group-mail-low ((t (:foreground "#edd400")))) - '(gnus-header-content ((t (:weight normal :foreground "#c4a000")))) - '(gnus-header-from ((t (:foreground "#edd400")))) - '(gnus-header-subject ((t (:foreground "#8ae234")))) - '(gnus-header-name ((t (:foreground "#729fcf")))) - '(gnus-header-newsgroups ((t (:foreground "#c17d11")))) - '(message-header-name ((t (:foreground "#729fcf")))) - '(message-header-cc ((t (:foreground "#c4a000")))) - '(message-header-other ((t (:foreground "#c17d11")))) - '(message-header-subject ((t (:foreground "#8ae234")))) - '(message-header-to ((t (:foreground "#edd400")))) - '(message-cited-text ((t (:foreground "#8ae234")))) - '(message-separator ((t (:foreground "#ad7fa8"))))) + `(default ((t (:foreground ,tango-theme-aluminium-1 + :background ,tango-theme-aluminium-6)))) + `(cursor ((t (:foreground ,tango-theme-aluminium-6 + :background ,tango-theme-butter-1)))) + `(highlight ((t (:foreground ,tango-theme-aluminium-6 + :background ,tango-theme-butter-2)))) + `(region ((t (:background ,tango-theme-aluminium-5)))) + + ;; Font lock + `(font-lock-builtin-face ((t (:foreground ,tango-theme-plum-1)))) + `(font-lock-comment-face ((t (:foreground ,tango-theme-chameleon-2)))) + `(font-lock-constant-face ((t (:foreground "#e6a8df")))) + `(font-lock-function-name-face ((t (:foreground ,tango-theme-butter-1)))) + `(font-lock-keyword-face ((t (:foreground "#8cc4ff")))) + `(font-lock-string-face ((t (:foreground ,tango-theme-chocolate-1)))) + `(font-lock-type-face ((t (:foreground "#a5ff4d")))) + `(font-lock-variable-name-face ((t (:foreground ,tango-theme-orange-1)))) + `(font-lock-warning-face ((t (:foreground ,tango-theme-scarlet-red-1)))) + + `(button ((t (:underline t :foreground ,tango-theme-sky-blue-1)))) + `(link ((t (:underline t :foreground ,tango-theme-sky-blue-1)))) + `(link-visited ((t (:underline t :foreground ,tango-theme-sky-blue-2)))) + `(mode-line ((t (:box (:line-width -1 :style released-button) + :background ,tango-theme-aluminium-2 + :foreground "black")))) + `(mode-line-inactive ((t (:box (:line-width -1 :style released-button) + :background ,tango-theme-aluminium-5 + :foreground "white")))) + `(isearch ((t (:foreground "#ffffff" + :background ,tango-theme-orange-3)))) + `(lazy-highlight ((t (:background ,tango-theme-chocolate-3)))) + + ;; SMerge + `(smerge-refined-change ((t (:background ,tango-theme-plum-3)))) + + ;; Ediff + `(ediff-current-diff-A ((t (:background ,tango-theme-plum-3)))) + `(ediff-fine-diff-A ((t (:background ,tango-theme-sky-blue-3)))) + `(ediff-current-diff-B ((t (:background ,tango-theme-orange-3)))) + `(ediff-fine-diff-B ((t (:background ,tango-theme-butter-3)))) + + ;; Flyspell + `(flyspell-duplicate ((t (:underline ,tango-theme-orange-1)))) + `(flyspell-incorrect ((t (:underline ,tango-theme-scarlet-red-1)))) + + ;; Gnus + `(gnus-group-news-1 ((t (:foreground ,tango-theme-plum-1)))) + `(gnus-group-news-1-low ((t (:foreground ,tango-theme-plum-2)))) + `(gnus-group-news-2 ((t (:foreground ,tango-theme-sky-blue-1)))) + `(gnus-group-news-2-low ((t (:foreground ,tango-theme-sky-blue-2)))) + `(gnus-group-news-3 ((t (:foreground ,tango-theme-chameleon-1)))) + `(gnus-group-news-3-low ((t (:foreground ,tango-theme-chameleon-2)))) + `(gnus-group-news-4 ((t (:foreground ,tango-theme-chocolate-1)))) + `(gnus-group-news-4-low ((t (:foreground ,tango-theme-chocolate-2)))) + `(gnus-group-news-5 ((t (:foreground ,tango-theme-orange-1)))) + `(gnus-group-news-5-low ((t (:foreground ,tango-theme-orange-2)))) + `(gnus-group-news-low ((t (:foreground ,tango-theme-butter-2)))) + `(gnus-group-mail-1 ((t (:foreground ,tango-theme-plum-1)))) + `(gnus-group-mail-1-low ((t (:foreground ,tango-theme-plum-2)))) + `(gnus-group-mail-2 ((t (:foreground ,tango-theme-sky-blue-1)))) + `(gnus-group-mail-2-low ((t (:foreground ,tango-theme-sky-blue-2)))) + `(gnus-group-mail-3 ((t (:foreground ,tango-theme-chameleon-1)))) + `(gnus-group-mail-3-low ((t (:foreground ,tango-theme-chameleon-2)))) + `(gnus-group-mail-low ((t (:foreground ,tango-theme-butter-2)))) + `(gnus-header-content ((t (:foreground ,tango-theme-butter-3 + :weight normal )))) + `(gnus-header-from ((t (:foreground ,tango-theme-butter-2)))) + `(gnus-header-subject ((t (:foreground ,tango-theme-chameleon-1)))) + `(gnus-header-name ((t (:foreground ,tango-theme-sky-blue-1)))) + `(gnus-header-newsgroups ((t (:foreground ,tango-theme-chocolate-2)))) + + `(message-header-name ((t (:foreground ,tango-theme-sky-blue-1)))) + `(message-header-cc ((t (:foreground ,tango-theme-butter-3)))) + `(message-header-other ((t (:foreground ,tango-theme-chocolate-2)))) + `(message-header-subject ((t (:foreground ,tango-theme-chameleon-1)))) + `(message-header-to ((t (:foreground ,tango-theme-butter-2)))) + `(message-cited-text ((t (:foreground ,tango-theme-chameleon-1)))) + `(message-separator ((t (:foreground ,tango-theme-plum-1)))) + + ;; Semantic + `(semantic-decoration-on-includes ((t (:underline "#e0e0e0")))) + `(semantic-decoration-on-private-members-face ((t (:background ,tango-theme-plum-3)))) + `(semantic-decoration-on-protected-members-face ((t (:background ,tango-theme-chocolate-3)))) + `(semantic-decoration-on-unknown-includes ((t (:background ,tango-theme-scarlet-red-3)))) + `(semantic-decoration-on-unparsed-includes ((t (:background ,tango-theme-aluminium-5)))) + + `(semantic-tag-boundary-face ((t (:overline ,tango-theme-sky-blue-1)))) + `(semantic-unmatched-syntax-face ((t (:underline ,tango-theme-scarlet-red-1)))) + + ;; Outline and Org-mode + `(outline-1 ((t (:foreground ,tango-theme-butter-2 + :bold t)))) + `(outline-2 ((t (:foreground ,tango-theme-orange-2 + :bold t)))) + `(outline-3 ((t (:foreground ,tango-theme-chameleon-2 + :bold t)))) + `(outline-4 ((t (:foreground ,tango-theme-sky-blue-1 + :bold t)))) + `(outline-5 ((t (:foreground ,tango-theme-chocolate-2 + :bold t)))) + `(outline-6 ((t (:foreground ,tango-theme-scarlet-red-1 + :bold t)))) + `(outline-7 ((t (:foreground ,tango-theme-plum-1 + :bold t))))) (provide-theme 'tango-dark) === modified file 'etc/themes/tango-theme.el' --- etc/themes/tango-theme.el 2010-10-12 20:06:20 +0000 +++ etc/themes/tango-theme.el 2010-10-27 07:29:21 +0000 @@ -19,69 +19,141 @@ ;;; Commentary -;; The colors in this theme come from the Tango palette, which is in -;; the public domain: http://tango.freedesktop.org/ +;; This theme uses the Tango color palette, which is in the public +;; domain: http://tango.freedesktop.org/. Color definitions can be +;; found tango-colors.el. ;;; Code: +(require 'tango-colors) + (deftheme tango "Theme for faces, based on the Tango palette on a light background. Basic, Font Lock, Isearch, Gnus, and Message faces are included.") (custom-theme-set-faces 'tango - '(default ((t (:foreground "#16191a" :background "#eeeeec")))) - '(cursor ((t (:foreground "#eeeeec" :background "#204a87")))) - '(highlight ((t (:background "#babdb6")))) - '(region ((t (:background "#babdb6")))) - '(font-lock-builtin-face ((t (:weight bold :foreground "#204a87")))) - '(font-lock-comment-face ((t (:foreground "#204a87")))) - '(font-lock-constant-face ((t (:weight bold :foreground "#5c3566")))) - '(font-lock-function-name-face ((t (:weight bold :foreground "#ce5c00")))) - '(font-lock-keyword-face ((t (:foreground "#a40000")))) - '(font-lock-string-face ((t (:foreground "#5c3566")))) - '(font-lock-type-face ((t (:weight bold :foreground "#4e9a06")))) - '(font-lock-variable-name-face ((t (:weight bold :foreground "#c17d11")))) - '(font-lock-warning-face ((t (:foreground "#cc0000")))) - '(button ((t (:underline t :foreground "#204a87")))) - '(link ((t (:underline t :foreground "#204a87")))) - '(link-visited ((t (:underline t :foreground "#3465a4")))) - '(mode-line ((t (:box (:line-width -1 :style released-button) - :background "#d3d7cf" :foreground "black")))) - '(mode-line-inactive ((t (:box (:line-width -1 :style released-button) - :background "#babdb6" :foreground "black")))) - '(isearch ((t (:foreground "#ffffff" :background "#ce5c00")))) - '(lazy-highlight ((t (:background "#e9b96e")))) - '(gnus-group-news-1 ((t (:weight bold :foreground "#5c3566")))) - '(gnus-group-news-1-low ((t (:foreground "#5c3566")))) - '(gnus-group-news-2 ((t (:weight bold :foreground "#204a87")))) - '(gnus-group-news-2-low ((t (:foreground "#204a87")))) - '(gnus-group-news-3 ((t (:weight bold :foreground "#4e0a06")))) - '(gnus-group-news-3-low ((t (:foreground "#4e0a06")))) - '(gnus-group-news-4 ((t (:weight bold :foreground "#7a4c02")))) - '(gnus-group-news-4-low ((t (:foreground "#7a4c02")))) - '(gnus-group-news-5 ((t (:weight bold :foreground "#ce5c00")))) - '(gnus-group-news-5-low ((t (:foreground "#ce5c00")))) - '(gnus-group-news-low ((t (:foreground "#888a85")))) - '(gnus-group-mail-1 ((t (:weight bold :foreground "#5c3566")))) - '(gnus-group-mail-1-low ((t (:foreground "#5c3566")))) - '(gnus-group-mail-2 ((t (:weight bold :foreground "#204a87")))) - '(gnus-group-mail-2-low ((t (:foreground "#204a87")))) - '(gnus-group-mail-3 ((t (:weight bold :foreground "#4e0a06")))) - '(gnus-group-mail-3-low ((t (:foreground "#4e0a06")))) - '(gnus-group-mail-low ((t (:foreground "#888a85")))) - '(gnus-header-content ((t (:foreground "#4e9a06")))) - '(gnus-header-from ((t (:weight bold :foreground "#c4a000")))) - '(gnus-header-subject ((t (:foreground "#4e0a06")))) - '(gnus-header-name ((t (:foreground "#204a87")))) - '(gnus-header-newsgroups ((t (:foreground "#888a85")))) - '(message-header-name ((t (:foreground "#204a87")))) - '(message-header-cc ((t (:foreground "#c4a000")))) - '(message-header-other ((t (:foreground "#c17d11")))) - '(message-header-subject ((t (:foreground "#4e0a06")))) - '(message-header-to ((t (:weight bold :foreground "#c4a000")))) - '(message-cited-text ((t (:foreground "#888a85")))) - '(message-separator ((t (:weight bold :foreground "#4e9a06"))))) + `(default ((t (:foreground "#16191a" + :background ,tango-theme-aluminium-1)))) + `(cursor ((t (:foreground ,tango-theme-aluminium-1 + :background ,tango-theme-sky-blue-2)))) + `(highlight ((t (:background ,tango-theme-aluminium-2)))) + `(region ((t (:background ,tango-theme-aluminium-2)))) + + ;; Font lock + `(font-lock-builtin-face ((t (:foreground ,tango-theme-sky-blue-2 + :weight bold )))) + `(font-lock-comment-face ((t (:foreground ,tango-theme-sky-blue-2)))) + `(font-lock-constant-face ((t (:foreground ,tango-theme-plum-2 + :weight bold )))) + `(font-lock-function-name-face ((t (:foreground ,tango-theme-orange-2 + :weight bold )))) + `(font-lock-keyword-face ((t (:foreground ,tango-theme-scarlet-red-2)))) + `(font-lock-string-face ((t (:foreground ,tango-theme-plum-2)))) + `(font-lock-type-face ((t (:foreground ,tango-theme-chameleon-2 + :weight bold )))) + `(font-lock-variable-name-face ((t (:foreground ,tango-theme-chocolate-1 + :weight bold )))) + `(font-lock-warning-face ((t (:foreground ,tango-theme-scarlet-red-1)))) + + `(button ((t (:foreground ,tango-theme-sky-blue-2 + :underline t )))) + `(link ((t (:foreground ,tango-theme-sky-blue-2 + :underline t )))) + `(link-visited ((t (:foreground ,tango-theme-sky-blue-1 + :underline t )))) + `(mode-line ((t (:box (:line-width -1 :style released-button) + :background ,tango-theme-aluminium-1 + :foreground "black")))) + `(mode-line-inactive ((t (:box (:line-width -1 :style released-button) + :background ,tango-theme-aluminium-2 + :foreground "black")))) + `(isearch ((t (:foreground "#ffffff" + :background ,tango-theme-orange-2)))) + `(lazy-highlight ((t (:background ,tango-theme-plum-3)))) + + ;; SMerge + `(smerge-refined-change ((t (:background ,tango-theme-plum-1)))) + + ;; Ediff + `(ediff-current-diff-A ((t (:background ,tango-theme-sky-blue-1)))) + `(ediff-fine-diff-A ((t (:background ,tango-theme-plum-1)))) + `(ediff-current-diff-B ((t (:background ,tango-theme-butter-1)))) + `(ediff-fine-diff-B ((t (:background ,tango-theme-orange-3)))) + + ;; Flyspell + `(flyspell-duplicate ((t (:underline ,tango-theme-orange-1)))) + `(flyspell-incorrect ((t (:underline ,tango-theme-scarlet-red-1)))) + + ;; Gnus + `(gnus-group-news-1 ((t (:foreground ,tango-theme-plum-2 + :weight bold)))) + `(gnus-group-news-1-low ((t (:foreground ,tango-theme-plum-2)))) + `(gnus-group-news-2 ((t (:foreground ,tango-theme-sky-blue-2 + :weight bold)))) + `(gnus-group-news-2-low ((t (:foreground ,tango-theme-sky-blue-2)))) + `(gnus-group-news-3 ((t (:foreground "#4e0a06" + :weight bold)))) + `(gnus-group-news-3-low ((t (:foreground "#4e0a06")))) + `(gnus-group-news-4 ((t (:foreground "#7a4c02" + :weight bold)))) + `(gnus-group-news-4-low ((t (:foreground "#7a4c02")))) + `(gnus-group-news-5 ((t (:foreground ,tango-theme-orange-2 + :weight bold)))) + `(gnus-group-news-5-low ((t (:foreground ,tango-theme-orange-2)))) + `(gnus-group-news-low ((t (:foreground ,tango-theme-aluminium-3)))) + `(gnus-group-mail-1 ((t (:foreground ,tango-theme-plum-2 + :weight bold)))) + `(gnus-group-mail-1-low ((t (:foreground ,tango-theme-plum-2)))) + `(gnus-group-mail-2 ((t (:foreground ,tango-theme-sky-blue-2 + :weight bold)))) + `(gnus-group-mail-2-low ((t (:foreground ,tango-theme-sky-blue-2)))) + `(gnus-group-mail-3 ((t (:foreground "#4e0a06" + :weight bold)))) + `(gnus-group-mail-3-low ((t (:foreground "#4e0a06")))) + `(gnus-group-mail-low ((t (:foreground ,tango-theme-aluminium-3)))) + `(gnus-header-content ((t (:foreground ,tango-theme-chameleon-2)))) + `(gnus-header-from ((t (:foreground ,tango-theme-butter-2 + :weight bold)))) + `(gnus-header-subject ((t (:foreground "#4e0a06")))) + `(gnus-header-name ((t (:foreground ,tango-theme-sky-blue-2)))) + `(gnus-header-newsgroups ((t (:foreground ,tango-theme-aluminium-3)))) + + `(message-header-name ((t (:foreground ,tango-theme-sky-blue-2)))) + `(message-header-cc ((t (:foreground ,tango-theme-butter-2)))) + `(message-header-other ((t (:foreground ,tango-theme-chocolate-1)))) + `(message-header-subject ((t (:foreground "#4e0a06")))) + `(message-header-to ((t (:foreground ,tango-theme-butter-2 + :weight bold )))) + `(message-cited-text ((t (:foreground ,tango-theme-aluminium-3)))) + `(message-separator ((t (:foreground ,tango-theme-chameleon-2 + :weight bold)))) + + ;; Semantic + `(semantic-decoration-on-includes ((t (:underline ,tango-theme-chameleon-3)))) + `(semantic-decoration-on-private-members-face ((t (:background ,tango-theme-aluminium-2)))) + `(semantic-decoration-on-protected-members-face ((t (:background ,tango-theme-aluminium-2)))) + `(semantic-decoration-on-unknown-includes ((t (:background ,tango-theme-orange-1)))) + `(semantic-decoration-on-unparsed-includes ((t (:underline ,tango-theme-aluminium-2)))) + + `(semantic-tag-boundary-face ((t (:overline ,tango-theme-sky-blue-1)))) + `(semantic-unmatched-syntax-face ((t (:underline ,tango-theme-scarlet-red-1)))) + + ;; Outline and Org-mode + `(outline-1 ((t (:foreground ,tango-theme-butter-2 + :bold t)))) + `(outline-2 ((t (:foreground ,tango-theme-orange-2 + :bold t)))) + `(outline-3 ((t (:foreground ,tango-theme-chameleon-2 + :bold t)))) + `(outline-4 ((t (:foreground ,tango-theme-sky-blue-1 + :bold t)))) + `(outline-5 ((t (:foreground ,tango-theme-chocolate-2 + :bold t)))) + `(outline-6 ((t (:foreground ,tango-theme-scarlet-red-1 + :bold t)))) + `(outline-7 ((t (:foreground ,tango-theme-plum-1 + :bold t))))) (provide-theme 'tango) === added file 'lisp/emacs-lisp/tango-colors.el' --- lisp/emacs-lisp/tango-colors.el 1970-01-01 00:00:00 +0000 +++ lisp/emacs-lisp/tango-colors.el 2010-10-27 07:29:21 +0000 @@ -0,0 +1,78 @@ +;;; tango-colors.el --- Color definitions of the Tango theme +;; +;; Copyright (C) 2010 Free Software Foundation, Inc. +;; +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + + +;;; Commentary: +;; +;; The colors in this file come from the Tango palette, which is in +;; the public domain: http://tango.freedesktop.org/ + + +;;; History: +;; + + +;;; Code: +;; + +(defmacro tango-theme-define-color (name values) + (let ((name (symbol-name name))) + `(defconst + ,(intern (concat "tango-theme" "-" name)) + ,values + ,(format "%s color of the Tango color theme." name)))) + +(tango-theme-define-color butter-1 "#fce94f") +(tango-theme-define-color butter-2 "#edd400") +(tango-theme-define-color butter-3 "#c4a000") + +(tango-theme-define-color chameleon-1 "#8ae234") +(tango-theme-define-color chameleon-2 "#73d216") +(tango-theme-define-color chameleon-3 "#4e9a06") + +(tango-theme-define-color orange-1 "#fcaf3e") +(tango-theme-define-color orange-2 "#f57900") +(tango-theme-define-color orange-3 "#ce5c00") + +(tango-theme-define-color sky-blue-1 "#729fcf") +(tango-theme-define-color sky-blue-2 "#3465a4") +(tango-theme-define-color sky-blue-3 "#204a87") + +(tango-theme-define-color plum-1 "#ad7fa8") +(tango-theme-define-color plum-2 "#75507b") +(tango-theme-define-color plum-3 "#5c3566") + +(tango-theme-define-color chocolate-1 "#e9b96e") +(tango-theme-define-color chocolate-2 "#c17d11") +(tango-theme-define-color chocolate-3 "#8f5902") + +(tango-theme-define-color scarlet-red-1 "#ef2929") +(tango-theme-define-color scarlet-red-2 "#cc0000") +(tango-theme-define-color scarlet-red-3 "#a40000") + +(tango-theme-define-color aluminium-1 "#eeeeec") +(tango-theme-define-color aluminium-2 "#d3d7cf") +(tango-theme-define-color aluminium-3 "#babdb6") +(tango-theme-define-color aluminium-4 "#888a85") +(tango-theme-define-color aluminium-5 "#555753") +(tango-theme-define-color aluminium-6 "#2e3436") + +(provide 'tango-colors) + +;;; tango-colors.el ends here # Begin bundle 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