Mercurial > emacs
changeset 111016:fedd4f6fa7e5
Move built-in theme directory to etc/.
* custom.el: Custom themes no longer use load-path.
(custom-theme-load-path): New option. Change built-in theme
directory to etc/.
(custom-enabled-themes): Add custom-theme-load-path dependency.
(custom-theme--load-path): New function.
(load-theme, custom-available-themes): Use it.
* cus-theme.el (describe-theme-1): Use custom-theme--load-path.
(customize-themes): Link to custom-theme-load-path variable.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 16 Oct 2010 14:27:08 -0400 |
| parents | 2ab042032557 |
| children | 9506df1b7b65 |
| files | etc/ChangeLog etc/NEWS etc/themes/tango-dark-theme.el etc/themes/tango-theme.el etc/themes/wheatgrass-theme.el lisp/ChangeLog lisp/cus-theme.el lisp/custom.el lisp/themes/tango-dark-theme.el lisp/themes/tango-theme.el lisp/themes/wheatgrass-theme.el |
| diffstat | 11 files changed, 325 insertions(+), 289 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/ChangeLog Sat Oct 16 17:08:47 2010 +0200 +++ b/etc/ChangeLog Sat Oct 16 14:27:08 2010 -0400 @@ -1,3 +1,7 @@ +2010-10-16 Chong Yidong <cyd@stupidchicken.com> + + * themes: New directory for custom theme files, moved from lisp/. + 2010-10-14 Juanma Barranquero <lekktu@gmail.com> * tutorials/TUTORIAL.es: Fix typos.
--- a/etc/NEWS Sat Oct 16 17:08:47 2010 +0200 +++ b/etc/NEWS Sat Oct 16 14:27:08 2010 -0400 @@ -199,6 +199,11 @@ *** `M-x customize-themes' lists Custom themes which can be enabled. +*** New option `custom-theme-load-path' is the load path for themes. +Emacs no longer looks for custom themes in `load-path'. The default +is to search in `custom-theme-directory', followed by a built-in theme +directory named "themes/" in `data-directory'. + ** The user option `remote-file-name-inhibit-cache' controls whether the remote file-name cache is used for read access.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/themes/tango-dark-theme.el Sat Oct 16 14:27:08 2010 -0400 @@ -0,0 +1,92 @@ +;;; tango-dark-theme.el --- Tango-based custom theme for faces + +;; 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 <http://www.gnu.org/licenses/>. + +;;; Commentary + +;; The colors in this theme come from the Tango palette, which is in +;; the public domain: http://tango.freedesktop.org/ + +;;; Code: + +(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"))))) + +(provide-theme 'tango-dark) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; tango-dark-theme.el ends here
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/themes/tango-theme.el Sat Oct 16 14:27:08 2010 -0400 @@ -0,0 +1,92 @@ +;;; tango-theme.el --- Tango-based custom theme for faces + +;; 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 <http://www.gnu.org/licenses/>. + +;;; Commentary + +;; The colors in this theme come from the Tango palette, which is in +;; the public domain: http://tango.freedesktop.org/ + +;;; Code: + +(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"))))) + +(provide-theme 'tango) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; tango-theme.el ends here
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/themes/wheatgrass-theme.el Sat Oct 16 14:27:08 2010 -0400 @@ -0,0 +1,66 @@ +;;; wheatgrass-theme.el --- custom theme for faces + +;; 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 <http://www.gnu.org/licenses/>. + +;;; Code: + +(deftheme wheatgrass + "Theme for basic, Font Lock, Isearch, Gnus, and Message faces. +The default face is wheat on a black background. Other faces +are in shades of green, brown, and blue.") + +(custom-theme-set-faces + 'wheatgrass + '(default ((t (:foreground "wheat" :background "black")))) + '(cursor ((t (:foreground "black" :background "thistle")))) + '(highlight ((t (:foreground "white" :background "dark green")))) + '(region ((t (:foreground "white" :background "dark green")))) + '(font-lock-builtin-face ((t (:foreground "LightSteelBlue")))) + '(font-lock-comment-face ((t (:foreground "SpringGreen3")))) + '(font-lock-constant-face ((t (:foreground "turquoise")))) + '(font-lock-function-name-face ((t (:foreground "pale green")))) + '(font-lock-keyword-face ((t (:foreground "white")))) + '(font-lock-string-face ((t (:foreground "dark khaki")))) + '(font-lock-type-face ((t (:foreground "aquamarine")))) + '(font-lock-variable-name-face ((t (:foreground "yellow green")))) + '(font-lock-warning-face ((t (:foreground "salmon1")))) + '(button ((t (:underline t :foreground "cyan")))) + '(link ((t (:underline t :foreground "cyan")))) + '(link-visited ((t (:underline t :foreground "dark cyan")))) + '(isearch ((t (:foreground "white" :background "dark goldenrod")))) + '(lazy-highlight ((t (:background "gray25")))) + '(gnus-header-content ((t (:weight normal :foreground "yellow green")))) + '(gnus-header-from ((t (:foreground "pale green")))) + '(gnus-header-subject ((t (:foreground "pale turquoise")))) + '(gnus-header-name ((t (:foreground "dark sea green")))) + '(gnus-header-newsgroups ((t (:foreground "dark khaki")))) + '(message-header-name ((t (:foreground "dark turquoise")))) + '(message-header-cc ((t (:foreground "yellow green")))) + '(message-header-other ((t (:foreground "dark khaki")))) + '(message-header-subject ((t (:foreground "pale turquoise")))) + '(message-header-to ((t (:foreground "pale green")))) + '(message-cited-text ((t (:foreground "SpringGreen3")))) + '(message-separator ((t (:foreground "deep sky blue"))))) + +(provide-theme 'wheatgrass) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; wheatgrass-theme.el ends here
--- a/lisp/ChangeLog Sat Oct 16 17:08:47 2010 +0200 +++ b/lisp/ChangeLog Sat Oct 16 14:27:08 2010 -0400 @@ -1,3 +1,17 @@ +2010-10-16 Chong Yidong <cyd@stupidchicken.com> + + * custom.el: Custom themes no longer use load-path. + (custom-theme-load-path): New option. Change built-in theme + directory to etc/. + (custom-enabled-themes): Add custom-theme-load-path dependency. + (custom-theme--load-path): New function. + (load-theme, custom-available-themes): Use it. + + * cus-theme.el (describe-theme-1): Use custom-theme--load-path. + (customize-themes): Link to custom-theme-load-path variable. + + * themes/*.el: Moved to etc/. + 2010-10-16 Ralf Angeli <angeli@caeruleus.net> * textmodes/reftex-cite.el
--- a/lisp/cus-theme.el Sat Oct 16 17:08:47 2010 +0200 +++ b/lisp/cus-theme.el Sat Oct 16 14:27:08 2010 -0400 @@ -316,7 +316,7 @@ (with-temp-buffer (emacs-lisp-mode) - (unless (file-exists-p custom-theme-directory) + (unless (file-directory-p custom-theme-directory) (make-directory (file-name-as-directory custom-theme-directory) t)) (setq buffer-file-name filename) (erase-buffer) @@ -419,7 +419,7 @@ (prin1 theme) (princ " is a custom theme") (let ((fn (locate-file (concat (symbol-name theme) "-theme.el") - (cons custom-theme-directory load-path) + (custom-theme--load-path) '("" "c"))) doc) (when fn @@ -508,26 +508,15 @@ "Type RET or click to enable/disable listed custom themes. Type \\[custom-describe-theme] to describe the theme at point. Theme files are named *-theme.el in `")) - (when (stringp custom-theme-directory) - (widget-create 'link :value custom-theme-directory - :button-face 'custom-link - :mouse-face 'highlight - :pressed-face 'highlight - :help-echo "Describe `custom-theme-directory'." - :keymap custom-mode-link-map - :follow-link 'mouse-face - :action (lambda (widget &rest ignore) - (describe-variable 'custom-theme-directory))) - (widget-insert "' or `")) - (widget-create 'link :value "load-path" + (widget-create 'link :value "custom-theme-load-path" :button-face 'custom-link :mouse-face 'highlight :pressed-face 'highlight - :help-echo "Describe `load-path'." + :help-echo "Describe `custom-theme-load-path'." :keymap custom-mode-link-map :follow-link 'mouse-face :action (lambda (widget &rest ignore) - (describe-variable 'load-path))) + (describe-variable 'custom-theme-load-path))) (widget-insert "'.\n\n") ;; If the user has made customizations, display a warning and
--- a/lisp/custom.el Sat Oct 16 17:08:47 2010 +0200 +++ b/lisp/custom.el Sat Oct 16 14:27:08 2010 -0400 @@ -996,9 +996,8 @@ ;;; Defining themes. -;; A theme file should be named `THEME-theme.el' (where THEME is the theme -;; name), and found in either `custom-theme-directory' or the load path. -;; It has the following format: +;; A theme file is named `THEME-theme.el' (where THEME is the theme +;; name) found in `custom-theme-load-path'. It has this format: ;; ;; (deftheme THEME ;; DOCSTRING) @@ -1053,16 +1052,31 @@ ;;; Loading themes. -(defcustom custom-theme-directory - user-emacs-directory - "Directory in which Custom theme files should be written. -`load-theme' searches this directory in addition to load-path. -The command `customize-create-theme' writes the files it produces -into this directory." +(defcustom custom-theme-directory user-emacs-directory + "Default user directory for storing custom theme files. +The command `customize-create-theme' writes theme files into this +directory. By default, Emacs searches for custom themes in this +directory first---see `custom-theme-load-path'." :type 'string :group 'customize :version "22.1") +(defcustom custom-theme-load-path (list 'custom-theme-directory t) + "List of directories to search for custom theme files. +Emacs commands for loading custom themes (e.g. `customize-themes' +and `load-theme') search for custom theme files in the specified +order. Each element in the list should be one of the following: +\(i) the symbol `custom-theme-directory', which means the value +of that variable; (ii) the symbol t (the built-in Emacs theme +directory, named \"themes\" in `data-directory'); or \(iii) a +directory name (a string)." + :type '(repeat (choice (const :tag "custom-theme-directory" + custom-theme-directory) + (const :tag "Built-in theme directory" t) + directory)) + :group 'customize + :version "24.1") + (defvar custom--inhibit-theme-enable nil "If non-nil, loading a theme does not enable it. This internal variable is set by `load-theme' when its NO-ENABLE @@ -1108,7 +1122,7 @@ (put theme 'theme-feature nil) (put theme 'theme-documentation nil)) (let ((fn (locate-file (concat (symbol-name theme) "-theme.el") - (cons custom-theme-directory load-path) + (custom-theme--load-path) '("" "c")))) (unless fn (error "Unable to find theme file for `%s'." theme)) @@ -1158,19 +1172,29 @@ (defun custom-available-themes () "Return a list of available Custom themes (symbols)." - (let* ((load-path (if (file-directory-p custom-theme-directory) - (cons custom-theme-directory load-path) - load-path)) - sym themes) - (dolist (dir load-path) - (dolist (file (file-expand-wildcards - (expand-file-name "*-theme.el" dir) t)) - (setq file (file-name-nondirectory file)) - (and (string-match "\\`\\(.+\\)-theme.el\\'" file) - (setq sym (intern (match-string 1 file))) - (custom-theme-name-valid-p sym) - (push sym themes)))) + (let* (sym themes) + (dolist (dir (custom-theme--load-path)) + (when (file-directory-p dir) + (dolist (file (file-expand-wildcards + (expand-file-name "*-theme.el" dir) t)) + (setq file (file-name-nondirectory file)) + (and (string-match "\\`\\(.+\\)-theme.el\\'" file) + (setq sym (intern (match-string 1 file))) + (custom-theme-name-valid-p sym) + (push sym themes))))) (delete-dups themes))) + +(defun custom-theme--load-path () + (let (lpath) + (dolist (f custom-theme-load-path) + (cond ((eq f 'custom-theme-directory) + (setq f custom-theme-directory)) + ((eq f t) + (setq f (expand-file-name "themes" data-directory)))) + (if (file-directory-p f) + (push f lpath))) + (nreverse lpath))) + ;;; Enabling and disabling loaded themes. @@ -1212,7 +1236,7 @@ and always takes precedence over other Custom Themes." :group 'customize :type '(repeat symbol) - :set-after '(custom-theme-directory) ; so we can find the themes + :set-after '(custom-theme-directory custom-theme-load-path) :set (lambda (symbol themes) ;; Avoid an infinite loop when custom-enabled-themes is ;; defined in a theme (e.g. `user'). Enabling the theme sets
--- a/lisp/themes/tango-dark-theme.el Sat Oct 16 17:08:47 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -;;; tango-dark-theme.el --- Tango-based custom theme for faces - -;; 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 <http://www.gnu.org/licenses/>. - -;;; Commentary - -;; The colors in this theme come from the Tango palette, which is in -;; the public domain: http://tango.freedesktop.org/ - -;;; Code: - -(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"))))) - -(provide-theme 'tango-dark) - -;; Local Variables: -;; no-byte-compile: t -;; End: - -;;; tango-dark-theme.el ends here
--- a/lisp/themes/tango-theme.el Sat Oct 16 17:08:47 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -;;; tango-theme.el --- Tango-based custom theme for faces - -;; 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 <http://www.gnu.org/licenses/>. - -;;; Commentary - -;; The colors in this theme come from the Tango palette, which is in -;; the public domain: http://tango.freedesktop.org/ - -;;; Code: - -(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"))))) - -(provide-theme 'tango) - -;; Local Variables: -;; no-byte-compile: t -;; End: - -;;; tango-theme.el ends here
--- a/lisp/themes/wheatgrass-theme.el Sat Oct 16 17:08:47 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -;;; wheatgrass-theme.el --- custom theme for faces - -;; 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 <http://www.gnu.org/licenses/>. - -;;; Code: - -(deftheme wheatgrass - "Theme for basic, Font Lock, Isearch, Gnus, and Message faces. -The default face is wheat on a black background. Other faces -are in shades of green, brown, and blue.") - -(custom-theme-set-faces - 'wheatgrass - '(default ((t (:foreground "wheat" :background "black")))) - '(cursor ((t (:foreground "black" :background "thistle")))) - '(highlight ((t (:foreground "white" :background "dark green")))) - '(region ((t (:foreground "white" :background "dark green")))) - '(font-lock-builtin-face ((t (:foreground "LightSteelBlue")))) - '(font-lock-comment-face ((t (:foreground "SpringGreen3")))) - '(font-lock-constant-face ((t (:foreground "turquoise")))) - '(font-lock-function-name-face ((t (:foreground "pale green")))) - '(font-lock-keyword-face ((t (:foreground "white")))) - '(font-lock-string-face ((t (:foreground "dark khaki")))) - '(font-lock-type-face ((t (:foreground "aquamarine")))) - '(font-lock-variable-name-face ((t (:foreground "yellow green")))) - '(font-lock-warning-face ((t (:foreground "salmon1")))) - '(button ((t (:underline t :foreground "cyan")))) - '(link ((t (:underline t :foreground "cyan")))) - '(link-visited ((t (:underline t :foreground "dark cyan")))) - '(isearch ((t (:foreground "white" :background "dark goldenrod")))) - '(lazy-highlight ((t (:background "gray25")))) - '(gnus-header-content ((t (:weight normal :foreground "yellow green")))) - '(gnus-header-from ((t (:foreground "pale green")))) - '(gnus-header-subject ((t (:foreground "pale turquoise")))) - '(gnus-header-name ((t (:foreground "dark sea green")))) - '(gnus-header-newsgroups ((t (:foreground "dark khaki")))) - '(message-header-name ((t (:foreground "dark turquoise")))) - '(message-header-cc ((t (:foreground "yellow green")))) - '(message-header-other ((t (:foreground "dark khaki")))) - '(message-header-subject ((t (:foreground "pale turquoise")))) - '(message-header-to ((t (:foreground "pale green")))) - '(message-cited-text ((t (:foreground "SpringGreen3")))) - '(message-separator ((t (:foreground "deep sky blue"))))) - -(provide-theme 'wheatgrass) - -;; Local Variables: -;; no-byte-compile: t -;; End: - -;;; wheatgrass-theme.el ends here