Update refinery-theme to v0.1.1

* lisp/bandali-theme.el: (setq sml/theme 'respectful).
* lisp/smart-mode-line-bandali-theme.el,
* lisp/tangomod-theme.el: Delete.

diff --git a/lib/refinery-theme b/lib/refinery-theme
index 71b5501..8322113 160000 (submodule)
--- a/lib/refinery-theme
+++ b/lib/refinery-theme
@@ -1 +1 @@
-Subproject commit 71b55010865881a496ace53deafa04da458bcec1
+Subproject commit 83221130cb12be47a38a3748dc8fb00cd2bc6740

diff --git a/lisp/bandali-theme.el b/lisp/bandali-theme.el
index 2266723..87fc231 100644 (file)
--- a/lisp/bandali-theme.el
+++ b/lisp/bandali-theme.el
@@ -24,11 +24,6 @@
 
 ;;; Code:
 
-(add-to-list
- 'custom-theme-load-path
- (expand-file-name
-  (convert-standard-filename "lisp") user-emacs-directory))
-
 (use-package refinery-theme
   :demand
   :config
@@ -40,7 +35,7 @@
   :config
   ;; thanks, but no thnaks; don't make fixed-width fills.
   (defun sml/fill-for-buffer-identification () "")
-  (setq sml/theme 'bandali)
+  (setq sml/theme 'respectful)
   (sml/setup)
   (smart-mode-line-enable))
 

diff --git a/lisp/smart-mode-line-bandali-theme.el b/lisp/smart-mode-line-bandali-theme.el
deleted file mode 100644 (file)
index c3a2fb3..0000000
--- a/lisp/smart-mode-line-bandali-theme.el
+++ /dev/null
@@ -1,51 +0,0 @@
-;;; smart-mode-line-bandali-theme.el --- bandali's smart-mode-line theme  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2019-2020  Amin Bandali
-
-;; Author: Amin Bandali <bandali@gnu.org>
-;; Version: 0.1.0
-;; Package-Requires: ((emacs "24.3") (smart-mode-line "2.10"))
-;; Keywords: faces
-
-;; This file is NOT part of GNU Emacs.
-
-;; This program 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.
-
-;; This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; My custom theme for smart-mode-line.
-
-;;; Code:
-
-(deftheme smart-mode-line-bandali
-  "My custom theme for smart-mode-line.")
-
-(custom-theme-set-faces
- 'smart-mode-line-bandali
- '(mode-line-buffer-id ((t :inherit sml/filename :foreground nil :background nil)))
- '(mode-line-inactive  ((t :background "#e1e1e1")))
- '(mode-line           ((t :background "#e7e7e7")))
- '(sml/global          ((t :inherit font-lock-preprocessor-face)))
- '(sml/filename        ((t :inherit mode-line-buffer-id)))
- '(sml/modes           ((t :foreground nil :inherit sml/filename :weight normal)))
- '(sml/prefix          ((t :inherit (font-lock-variable-name-face sml/global))))
- '(sml/read-only       ((t :inherit (font-lock-type-face sml/not-modified)))))
-
-;;;###autoload
-(when load-file-name
-  (add-to-list 'custom-theme-load-path
-               (file-name-as-directory (file-name-directory load-file-name))))
-
-(provide-theme 'smart-mode-line-bandali)
-;;; smart-mode-line-bandali-theme.el ends here.

diff --git a/lisp/tangomod-theme.el b/lisp/tangomod-theme.el
deleted file mode 100644 (file)
index 5ec1bd1..0000000
--- a/lisp/tangomod-theme.el
+++ /dev/null
@@ -1,154 +0,0 @@
-;;; tangomod-theme.el --- Tango-based custom theme for faces
-
-;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
-
-;; Authors: Chong Yidong <cyd@stupidchicken>
-;;          Jan Moringen <jan.moringen@uni-bielefeld.de>
-
-;; 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 tangomod
-  "Face colors using the Tango palette (light background).
-Basic, Font Lock, Isearch, Gnus, Message, Ediff, Flyspell,
-Semantic, and Ansi-Color faces are included.")
-
-(let ((class '((class color) (min-colors 89)))
-      ;; Tango palette colors.
-      (butter-1 "#fce94f") (butter-2 "#edd400") (butter-3 "#c4a000")
-      (orange-1 "#fcaf3e") (orange-2 "#f57900") (orange-3 "#ce5c00")
-      (choc-1 "#e9b96e") (choc-2 "#c17d11") (choc-3 "#8f5902")
-      (cham-1 "#8ae234") (cham-2 "#73d216") (cham-3 "#4e9a06")
-      (blue-1 "#729fcf") (blue-2 "#3465a4") (blue-3 "#204a87")
-      (plum-1 "#ad7fa8") (plum-2 "#75507b") (plum-3 "#5c3566")
-      (red-1 "#ef2929")  (red-2 "#cc0000")  (red-3 "#a40000")
-      (alum-1 "#ffffff") (alum-2 "#d3d7cf") (alum-3 "#babdb6")
-      (alum-4 "#888a85") (alum-5 "#5f615c") (alum-6 "#000000")
-      ;; Not in Tango palette; used for better contrast.
-      (cham-4 "#346604") (blue-0 "#8cc4ff") (orange-4 "#b35000"))
-
-  (custom-theme-set-faces
-   'tangomod
-   `(default ((,class (:foreground ,alum-6 :background ,alum-1))))
-   `(cursor ((,class (:background ,blue-3))))
-   ;; Highlighting faces
-   `(fringe ((,class (:background "#FFFFFF")))) ;; EDITED
-   `(highlight ((,class (:foreground ,alum-6 :background ,butter-2))))
-   ;; Disabled for talk at PL offsite
-   ;; `(highlight ((,class (:background ,alum-3))))
-   `(region ((,class (:background ,alum-3))))
-   `(secondary-selection ((,class (:background ,blue-0))))
-   `(isearch ((,class (:foreground "#ffffff" :background ,orange-3))))
-   `(lazy-highlight ((,class (:background ,choc-1))))
-   `(trailing-whitespace ((,class (:background ,red-1))))
-   ;; Paren face
-   `(show-paren-match ((,class (:background ,blue-1))))
-   ;; Mode line faces
-   `(mode-line ((,class (:box (:line-width -1 :style released-button)
-                              :background ,alum-2 :foreground ,alum-6))))
-   `(mode-line-inactive ((,class (:box (:line-width -1 :style released-button)
-                                       :background ,alum-4 :foreground ,alum-6))))
-   ;; Escape and prompt faces
-   `(minibuffer-prompt ((,class (:weight bold :foreground ,blue-3))))
-   `(escape-glyph ((,class (:foreground ,red-3))))
-   `(error ((,class (:foreground ,red-3))))
-   `(warning ((,class (:foreground ,orange-3))))
-   `(success ((,class (:foreground ,cham-3))))
-   ;; Font lock faces
-   `(font-lock-builtin-face ((,class (:foreground ,plum-2))))
-   `(font-lock-comment-face ((,class (:slant italic :foreground ,alum-5))))
-   `(font-lock-constant-face ((,class (:weight bold :foreground ,blue-3))))
-   `(font-lock-function-name-face ((,class (:foreground ,red-3))))
-   `(font-lock-keyword-face ((,class (:foreground ,cham-4))))
-   `(font-lock-string-face ((,class (:foreground ,plum-3))))
-   `(font-lock-type-face ((,class (:foreground ,blue-3))))
-   `(font-lock-variable-name-face ((,class (:foreground ,orange-4))))
-   ;; Button and link faces
-   `(link ((,class (:underline t :foreground ,blue-3))))
-   `(link-visited ((,class (:underline t :foreground ,blue-2))))
-   ;; Gnus faces
-   `(gnus-group-news-1 ((,class (:weight bold :foreground ,plum-3))))
-   `(gnus-group-news-1-low ((,class (:foreground ,plum-3))))
-   `(gnus-group-news-2 ((,class (:weight bold :foreground ,blue-3))))
-   `(gnus-group-news-2-low ((,class (:foreground ,blue-3))))
-   `(gnus-group-news-3 ((,class (:weight bold :foreground ,red-3))))
-   `(gnus-group-news-3-low ((,class (:foreground ,red-3))))
-   `(gnus-group-news-4 ((,class (:weight bold :foreground ,"#7a4c02"))))
-   `(gnus-group-news-4-low ((,class (:foreground ,"#7a4c02"))))
-   `(gnus-group-news-5 ((,class (:weight bold :foreground ,orange-3))))
-   `(gnus-group-news-5-low ((,class (:foreground ,orange-3))))
-   `(gnus-group-news-low ((,class (:foreground ,alum-4))))
-   `(gnus-group-mail-1 ((,class (:weight bold :foreground ,plum-3))))
-   `(gnus-group-mail-1-low ((,class (:foreground ,plum-3))))
-   `(gnus-group-mail-2 ((,class (:weight bold :foreground ,blue-3))))
-   `(gnus-group-mail-2-low ((,class (:foreground ,blue-3))))
-   `(gnus-group-mail-3 ((,class (:weight bold :foreground ,cham-3))))
-   `(gnus-group-mail-3-low ((,class (:foreground ,cham-3))))
-   `(gnus-group-mail-low ((,class (:foreground ,alum-4))))
-   `(gnus-header-content ((,class (:foreground ,cham-3))))
-   `(gnus-header-from ((,class (:weight bold :foreground ,butter-3))))
-   `(gnus-header-subject ((,class (:foreground ,red-3))))
-   `(gnus-header-name ((,class (:foreground ,blue-3))))
-   `(gnus-header-newsgroups ((,class (:foreground ,alum-4))))
-   ;; Message faces
-   `(message-header-name ((,class (:foreground ,blue-3))))
-   `(message-header-cc ((,class (:foreground ,butter-3))))
-   `(message-header-other ((,class (:foreground ,choc-2))))
-   `(message-header-subject ((,class (:foreground ,red-3))))
-   `(message-header-to ((,class (:weight bold :foreground ,butter-3))))
-   `(message-cited-text ((,class (:slant italic :foreground ,alum-5))))
-   `(message-separator ((,class (:weight bold :foreground ,cham-3))))
-   ;; SMerge
-   `(smerge-refined-change ((,class (:background ,plum-1))))
-   ;; Ediff
-   `(ediff-current-diff-A ((,class (:background ,blue-1))))
-   `(ediff-fine-diff-A ((,class (:background ,plum-1))))
-   `(ediff-current-diff-B ((,class (:background ,butter-1))))
-   `(ediff-fine-diff-B ((,class (:background ,orange-1))))
-   ;; Flyspell
-   `(flyspell-duplicate ((,class (:underline ,orange-1))))
-   `(flyspell-incorrect ((,class (:underline ,red-1))))
-   ;; Semantic faces
-   `(semantic-decoration-on-includes ((,class (:underline  ,cham-4))))
-   `(semantic-decoration-on-private-members-face
-     ((,class (:background ,alum-2))))
-   `(semantic-decoration-on-protected-members-face
-     ((,class (:background ,alum-2))))
-   `(semantic-decoration-on-unknown-includes
-     ((,class (:background ,choc-3))))
-   `(semantic-decoration-on-unparsed-includes
-     ((,class (:underline  ,orange-3))))
-   `(semantic-tag-boundary-face ((,class (:overline   ,blue-1))))
-   `(semantic-unmatched-syntax-face ((,class (:underline  ,red-1)))))
-
-  (custom-theme-set-variables
-   'tangomod
-   `(ansi-color-names-vector [,alum-6 ,red-3 ,cham-3 ,butter-3
-                                     ,blue-3 ,plum-3 ,blue-1 ,alum-1])))
-
-(provide-theme 'tangomod)
-
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
-
-;;; tangomod-theme.el ends here