# 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