From: Protesilaos Stavrou Date: Fri, 5 Mar 2021 18:31:08 +0000 (+0000) Subject: Pull Modus themes version 1.2.3 from upstream X-Git-Tag: emacs-28.0.90~3415 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fb33bae32e39f597317eb4857447bb0ea1a4de3;p=emacs.git Pull Modus themes version 1.2.3 from upstream This syncs with the following upstream revision: Update to version 1.2.3 0a36239 2021-03-05 19:43:30 +0200 https://gitlab.com/protesilaos/modus-themes/-/commit/0a36239baf908585cdf32c6188eb86713d9bf6c6 For discussion, see bug#45068 and the following upstream issue: https://gitlab.com/protesilaos/modus-themes/-/issues/162 * doc/misc/modus-themes.org: * etc/themes/modus-operandi-theme.el: * etc/themes/modus-themes.el: * etc/themes/modus-vivendi-theme.el: Update to version 1.2.3. --- diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 20d7767053f..ed464e84656 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -4,8 +4,8 @@ #+language: en #+options: ':t toc:nil author:t email:t -#+macro: stable-version 1.2.0 -#+macro: release-date 2021-03-04 +#+macro: stable-version 1.2.3 +#+macro: release-date 2021-03-05 #+macro: development-version 1.3.0-dev #+macro: export-date (eval (format-time-string "%F %R %z" (current-time))) #+macro: file @@texinfo:@file{@@$1@@texinfo:}@@ @@ -35,8 +35,8 @@ The documentation furnished herein corresponds to stable version feature which does not yet form part of the latest tagged commit, is explicitly marked as such. -# Current development target is {{{development-version}}}. This manual was -# built on {{{export-date}}}. +Current development target is {{{development-version}}}. This manual was +built on {{{export-date}}}. #+toc: headlines 8 insert TOC here, with eight headline levels diff --git a/etc/themes/modus-operandi-theme.el b/etc/themes/modus-operandi-theme.el index ce2c75e9a89..64763a16825 100644 --- a/etc/themes/modus-operandi-theme.el +++ b/etc/themes/modus-operandi-theme.el @@ -4,7 +4,7 @@ ;; Author: Protesilaos Stavrou ;; URL: https://gitlab.com/protesilaos/modus-themes -;; Version: 1.2.0 +;; Version: 1.2.3 ;; Package-Requires: ((emacs "26.1")) ;; Keywords: faces, theme, accessibility @@ -50,7 +50,10 @@ -(require-theme 'modus-themes) +(eval-and-compile + (unless (and (fboundp 'require-theme) + (require-theme 'modus-themes t)) + (require 'modus-themes))) (deftheme modus-operandi "Accessible and customizable light theme (WCAG AAA standard). diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el index 79846dbf3af..c315d5971b1 100644 --- a/etc/themes/modus-themes.el +++ b/etc/themes/modus-themes.el @@ -4,7 +4,7 @@ ;; Author: Protesilaos Stavrou ;; URL: https://gitlab.com/protesilaos/modus-themes -;; Version: 1.2.0 +;; Version: 1.2.3 ;; Package-Requires: ((emacs "26.1")) ;; Keywords: faces, theme, accessibility @@ -3616,7 +3616,7 @@ by virtue of calling either of `modus-themes-load-operandi' and ;;;;; dictionary `(dictionary-button-face ((,class :inherit bold :foreground ,fg-special-cold))) `(dictionary-reference-face ((,class :inherit button))) - `(dictionary-word-definition-face ((,class))) + `(dictionary-word-definition-face (())) `(dictionary-word-entry-face ((,class :inherit font-lock-comment-face))) ;;;;; diff-hl `(diff-hl-change ((,class :inherit modus-theme-fringe-yellow))) @@ -3918,8 +3918,8 @@ by virtue of calling either of `modus-themes-load-operandi' and `(epa-field-name ((,class :inherit bold :foreground ,fg-dim))) `(epa-mark ((,class :inherit bold :foreground ,magenta))) `(epa-string ((,class :foreground ,blue-alt))) - `(epa-validity-disabled ((,class :inherit modus-theme-refine-red))) - `(epa-validity-high ((,class :inherit bold :foreground ,green-alt-other))) + `(epa-validity-disabled ((,class :foreground ,red))) + `(epa-validity-high ((,class :inherit bold :foreground ,cyan))) `(epa-validity-low ((,class :inherit shadow))) `(epa-validity-medium ((,class :foreground ,green-alt))) ;;;;; equake @@ -5378,7 +5378,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(org-done ((,class :foreground ,green))) `(org-drawer ((,class ,@(modus-themes--mixed-fonts) :foreground ,fg-alt))) - `(org-ellipsis ((,class))) ; inherits from the heading's color + `(org-ellipsis (())) ; inherits from the heading's color `(org-footnote ((,class :inherit button ,@(modus-themes--link-color blue-alt blue-alt-faint)))) @@ -5811,7 +5811,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(sh-quoted-exec ((,class :inherit modus-theme-bold :foreground ,magenta-alt))) ;;;;; shortdoc `(shortdoc-heading ((,class :inherit modus-theme-pseudo-header))) - `(shortdoc-section ((,class))) ; remove the default's variable-pitch style + `(shortdoc-section (())) ; remove the default's variable-pitch style ;;;;; show-paren-mode `(show-paren-match ((,class ,@(modus-themes--paren bg-paren-match bg-paren-match-intense) @@ -5875,7 +5875,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(smerge-lower ((,class :inherit modus-theme-diff-added))) `(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2))) `(smerge-refined-added ((,class :inherit modus-theme-diff-refine-added))) - `(smerge-refined-changed ((,class))) + `(smerge-refined-changed (())) `(smerge-refined-removed ((,class :inherit modus-theme-diff-refine-removed))) `(smerge-upper ((,class :inherit modus-theme-diff-removed))) ;;;;; solaire @@ -6432,5 +6432,11 @@ by virtue of calling either of `modus-themes-load-operandi' and `(org-src-block-faces '()))) "Custom variables for `modus-themes-theme'.") +;;;###autoload +(when load-file-name + (let ((dir (file-name-directory load-file-name))) + (unless (equal dir (expand-file-name "themes/" data-directory)) + (add-to-list 'custom-theme-load-path dir)))) + (provide 'modus-themes) ;;; modus-themes.el ends here diff --git a/etc/themes/modus-vivendi-theme.el b/etc/themes/modus-vivendi-theme.el index fd7f5df24d7..814f10d105b 100644 --- a/etc/themes/modus-vivendi-theme.el +++ b/etc/themes/modus-vivendi-theme.el @@ -4,7 +4,7 @@ ;; Author: Protesilaos Stavrou ;; URL: https://gitlab.com/protesilaos/modus-themes -;; Version: 1.2.0 +;; Version: 1.2.3 ;; Package-Requires: ((emacs "26.1")) ;; Keywords: faces, theme, accessibility @@ -50,7 +50,10 @@ -(require-theme 'modus-themes) +(eval-and-compile + (unless (and (fboundp 'require-theme) + (require-theme 'modus-themes t)) + (require 'modus-themes))) (deftheme modus-vivendi "Accessible and customizable dark theme (WCAG AAA standard).