From 454e1a06a2c5194a81148df91da6ee441adb601b Mon Sep 17 00:00:00 2001 From: Protesilaos Stavrou Date: Sat, 1 Oct 2022 10:57:59 +0300 Subject: [PATCH] Update to Modus themes stable version 2.7.0 * doc/misc/modus-themes.org (Load theme depending on time of day): Add missing keyword from sample configuration. (Full support for packages or face groups): Update list of supported packages. (Note on goto-address-mode faces): Add documentation about possible user-level tweaks. (Are these color schemes?): Fix typo. (Acknowledgements): Update list of contributors to the project. * etc/themes/modus-themes.el (modus-themes--version): Update to current stable version. (modus-themes-vivendi-colors): Tweak value of a single color. (modus-themes-faces): Update list of supported faces. (modus-themes-custom-variables): Remove outdated "TODO" comment. * etc/themes/modus-operandi-theme.el: * etc/themes/modus-vivendi-theme.el: Update version header. Release notes: . --- doc/misc/modus-themes.org | 107 +++++++++++++++++++---------- etc/themes/modus-operandi-theme.el | 2 +- etc/themes/modus-themes.el | 46 ++++++++++--- etc/themes/modus-vivendi-theme.el | 2 +- 4 files changed, 108 insertions(+), 49 deletions(-) diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index fdc1dfcaba1..2680fe9eb51 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -4,9 +4,9 @@ #+language: en #+options: ':t toc:nil author:t email:t num:t #+startup: content -#+macro: stable-version 2.6.0 -#+macro: release-date 2022-08-19 -#+macro: development-version 2.7.0-dev +#+macro: stable-version 2.7.0 +#+macro: release-date 2022-10-01 +#+macro: development-version 2.8.0-dev #+macro: file @@texinfo:@file{@@$1@@texinfo:}@@ #+macro: space @@texinfo:@: @@ #+macro: kbd @@texinfo:@kbd{@@$1@@texinfo:}@@ @@ -3902,6 +3902,7 @@ package: (use-package circadian ; you need to install this :ensure :after solar + :config (setq circadian-themes '((:sunrise . modus-operandi) (:sunset . modus-vivendi))) (circadian-setup)) @@ -4514,6 +4515,7 @@ have lots of extensions, so the "full support" may not be 100% true… + calendar and diary + calfw + calibredb ++ centaur-tabs + cfrs + change-log and log-view (such as ~vc-print-log~, ~vc-print-root-log~) + chart @@ -4533,6 +4535,7 @@ have lots of extensions, so the "full support" may not be 100% true… + counsel-css + cov + cperl-mode ++ crontab-mode + css-mode + csv-mode + ctrlf @@ -4705,6 +4708,7 @@ have lots of extensions, so the "full support" may not be 100% true… + powerline + powerline-evil + prism ([[#h:a94272e0-99da-4149-9e80-11a7e67a2cf2][Note for prism.el]]) ++ prescient + proced + prodigy + pulse @@ -4738,6 +4742,7 @@ have lots of extensions, so the "full support" may not be 100% true… + smerge + spaceline + speedbar ++ spell-fu + stripes + suggest + switch-window @@ -5596,6 +5601,32 @@ those buttons. Disabling the logo fixes the problem: (setq notmuch-show-logo nil) #+end_src +** Note on goto-address-mode faces +:PROPERTIES: +:CUSTOM_ID: h:2d74236a-e41c-4616-8735-75f949a67334 +:END: + +The built-in ~goto-address-mode~ uses heuristics to identify URLs and +email addresses in the current buffer. It then applies a face to them +to change their style. Some packages, such as =notmuch=, use this +minor-mode automatically. + +The faces are not declared with ~defface~, meaning that it is better +that the theme does not modify them. The user is thus encouraged to +consider including (or equivalent) this in their setup: + +#+begin_src emacs-lisp +(setq goto-address-url-face 'link + goto-address-url-mouse-face 'highlight + goto-address-mail-face 'link + goto-address-mail-mouse-face 'highlight) +#+end_src + +My personal preference is to set ~goto-address-mail-face~ to nil, as +it otherwise adds too much visual noise to the buffer (email addresses +stand out more, due to the use of the uncommon =@= character but also +because they are often enclosed in angled brackets). + * Frequently Asked Questions :properties: :custom_id: h:b3384767-30d3-4484-ba7f-081729f03a47 @@ -5852,7 +5883,7 @@ interface virtually unusable. [[#h:5808be52-361a-4d18-88fd-90129d206f9b][Option for links]]. -Again, one must exercise judgment in order to avoid discrimination, +Again, one must exercise judgement in order to avoid discrimination, where "discrimination" refers to: + The treatment of substantially different magnitudes as if they were of @@ -6072,42 +6103,44 @@ The Modus themes are a collective effort. Every bit of work matters. + Author/maintainer :: Protesilaos Stavrou. + Contributions to code or documentation :: Alex Griffin, Anders - Johansson, Basil L.{{{space()}}} Contovounesios, Björn Lindström, - Carlo Zancanaro, Christian Tietze, Daniel Mendler, Eli Zaretskii, - Fritz Grabo, Illia Ostapyshyn, Kévin Le Gouguec, Kostadin Ninev, - Madhavan Krishnan, Manuel Giraud, Markus Beppler, Matthew Stevenson, - Mauro Aranda, Nicolas De Jaeghere, Paul David, Philip Kaludercic, - Pierre Téchoueyres, Rudolf Adamkovič, Stephen Gildea, Shreyas Ragavan, - Stefan Kangas, Utkarsh Singh, Vincent Murphy, Xinglu Chen, Yuanchen - Xie. + Johansson, Antonio Ruiz, Basil L.{{{space()}}} Contovounesios, Björn + Lindström, Carlo Zancanaro, Christian Tietze, Daniel Mendler, Eli + Zaretskii, Fritz Grabo, Illia Ostapyshyn, Kévin Le Gouguec, Koen van + Greevenbroek, Kostadin Ninev, Madhavan Krishnan, Manuel Giraud, + Markus Beppler, Matthew Stevenson, Mauro Aranda, Nicolas De + Jaeghere, Paul David, Philip Kaludercic, Pierre Téchoueyres, Rudolf + Adamkovič, Stephen Gildea, Shreyas Ragavan, Stefan Kangas, Utkarsh + Singh, Vincent Murphy, Xinglu Chen, Yuanchen Xie, okamsn. + Ideas and user feedback :: Aaron Jensen, Adam Porter, Adam Spiers, - Adrian Manea, Alex Griffin, Alex Koen, Alex Peitsinis, Alexey Shmalko, - Alok Singh, Anders Johansson, André Alexandre Gomes, Andrew Tropin, - Antonio Hernández Blas, Arif Rezai, Augusto Stoffel, Basil + Adrian Manea, Alex Griffin, Alex Koen, Alex Peitsinis, Alexey + Shmalko, Alok Singh, Anders Johansson, André Alexandre Gomes, Andrew + Tropin, Antonio Hernández Blas, Arif Rezai, Augusto Stoffel, Basil L.{{{space()}}} Contovounesios, Burgess Chang, Christian Tietze, - Christopher Dimech, Christopher League, Damien Cassou, Daniel Mendler, - Dario Gjorgjevski, David Edmondson, Davor Rotim, Divan Santana, Eliraz - Kedmi, Emanuele Michele Alberto Monterosso, Farasha Euker, Feng Shu, - Gautier Ponsinet, Gerry Agbobada, Gianluca Recchia, Gonçalo Marrafa, - Guilherme Semente, Gustavo Barros, Hörmetjan Yiltiz, Ilja Kocken, Iris - Garcia, Ivan Popovych, Jeremy Friesen, Jerry Zhang, Johannes Grødem, - John Haman, Jonas Collberg, Jorge Morais, Joshua O'Connor, Julio - C. Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec, Kostadin - Ninev, Len Trigg, Lennart C. Karssen, Magne Hov, Manuel Uberti, Mark - Bestley, Mark Burton, Markus Beppler, Matt Armstrong, Mauro Aranda, - Maxime Tréca, Michael Goldenberg, Morgan Smith, Morgan Willcock, - Murilo Pereira, Nicky van Foreest, Nicolas De Jaeghere, Paul Poloskov, - Pengji Zhang, Pete Kazmier, Peter Wu, Philip Kaludercic, Pierre - Téchoueyres, Przemysław Kryger, Robert Hepple, Roman Rudakov, Ryan - Phillips, Rytis Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel - Culpepper, Saša Janiška, Shreyas Ragavan, Simon Pugnet, Tassilo Horn, - Thibaut Verron, Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey - Merkley, Tomasz Hołubowicz, Toon Claes, Uri Sharf, Utkarsh Singh, - Vincent Foley. As well as users: Ben, CsBigDataHub1, Emacs Contrib, - Eugene, Fourchaux, Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, - Trey, bepolymathe, bit9tream, derek-upham, doolio, fleimgruber, - gitrj95, iSeeU, jixiuf, okamsn, pRot0ta1p. + Christopher Dimech, Christopher League, Damien Cassou, Daniel + Mendler, Dario Gjorgjevski, David Edmondson, Davor Rotim, Divan + Santana, Eliraz Kedmi, Emanuele Michele Alberto Monterosso, Farasha + Euker, Feng Shu, Gautier Ponsinet, Gerry Agbobada, Gianluca Recchia, + Gonçalo Marrafa, Guilherme Semente, Gustavo Barros, Hörmetjan + Yiltiz, Ilja Kocken, Iris Garcia, Ivan Popovych, Jeremy Friesen, + Jerry Zhang, Johannes Grødem, John Haman, Jonas Collberg, Jorge + Morais, Joshua O'Connor, Julio C. Villasante, Kenta Usami, Kevin + Fleming, Kévin Le Gouguec, Kostadin Ninev, Len Trigg, Lennart + C. Karssen, Luis Miguel Castañeda, Magne Hov, Manuel Uberti, Mark + Bestley, Mark Burton, Mark Simpson, Markus Beppler, Matt Armstrong, + Mauro Aranda, Maxime Tréca, Michael Goldenberg, Morgan Smith, Morgan + Willcock, Murilo Pereira, Nicky van Foreest, Nicolas De Jaeghere, + Paul Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu, Philip + Kaludercic, Pierre Téchoueyres, Przemysław Kryger, Robert Hepple, + Roman Rudakov, Ryan Phillips, Rytis Paškauskas, Rudolf Adamkovič, + Sam Kleinman, Samuel Culpepper, Saša Janiška, Shreyas Ragavan, Simon + Pugnet, Tassilo Horn, Thibaut Verron, Thomas Heartman, Togan + Muftuoglu, Tony Zorman, Trey Merkley, Tomasz Hołubowicz, Toon Claes, + Uri Sharf, Utkarsh Singh, Vincent Foley. As well as users: Ben, + CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Fredrik, Moesasji, + Nick, Summer Emacs, TheBlob42, Trey, bepolymathe, bit9tream, + derek-upham, doolio, fleimgruber, gitrj95, iSeeU, jixiuf, okamsn, + pRot0ta1p. + Packaging :: Basil L.{{{space()}}} Contovounesios, Eli Zaretskii, Glenn Morris, Mauro Aranda, Richard Stallman, Stefan Kangas (core diff --git a/etc/themes/modus-operandi-theme.el b/etc/themes/modus-operandi-theme.el index fd7ffff98ff..6e609c08036 100644 --- a/etc/themes/modus-operandi-theme.el +++ b/etc/themes/modus-operandi-theme.el @@ -6,7 +6,7 @@ ;; Maintainer: Modus-Themes Development <~protesilaos/modus-themes@lists.sr.ht> ;; URL: https://git.sr.ht/~protesilaos/modus-themes ;; Mailing-List: https://lists.sr.ht/~protesilaos/modus-themes -;; Version: 2.6.0 +;; Version: 2.7.1 ;; Package-Requires: ((emacs "27.1")) ;; Keywords: faces, theme, accessibility diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el index a6bbdfe0bb8..d5e1b0a120b 100644 --- a/etc/themes/modus-themes.el +++ b/etc/themes/modus-themes.el @@ -6,7 +6,7 @@ ;; Maintainer: Modus-Themes Development <~protesilaos/modus-themes@lists.sr.ht> ;; URL: https://git.sr.ht/~protesilaos/modus-themes ;; Mailing-List: https://lists.sr.ht/~protesilaos/modus-themes -;; Version: 2.6.0 +;; Version: 2.7.1 ;; Package-Requires: ((emacs "27.1")) ;; Keywords: faces, theme, accessibility @@ -109,7 +109,7 @@ cover the blue-cyan-magenta side of the spectrum." :prefix "modus-themes-" :tag "Modus Themes Faces") -(defvar modus-themes--version "2.6.0" +(defvar modus-themes--version "2.7.0" "Current version of the Modus themes. The version either is the last tagged release, such as '1.0.0', @@ -634,7 +634,7 @@ symbol and the latter as a string.") (bg-diff-focus-added . "#1d3c25") (fg-diff-focus-added . "#b4ddb4") (bg-diff-focus-added-deuteran . "#003959") (fg-diff-focus-added-deuteran . "#bfe4ff") (bg-diff-focus-changed . "#424200") (fg-diff-focus-changed . "#d0daaf") - (bg-diff-focus-removed . "#500f29") (fg-diff-focus-removed . "#eebdba") + (bg-diff-focus-removed . "#601f29") (fg-diff-focus-removed . "#eebdba") (bg-mark-sel . "#002f2f") (fg-mark-sel . "#60cfa2") (bg-mark-del . "#5a0000") (fg-mark-del . "#ff99aa") @@ -4387,6 +4387,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(help-key-binding ((,class :inherit modus-themes-key-binding))) `(homoglyph ((,class :foreground ,red-alt-faint))) `(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other-faint))) + `(icon-button ((,class :inherit modus-themes-box-button))) `(italic ((,class :slant italic))) `(nobreak-hyphen ((,class :foreground ,fg-escape-char-construct))) `(nobreak-space ((,class :foreground ,fg-escape-char-construct :underline t))) @@ -4396,6 +4397,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(mm-uu-extract ((,class :background ,bg-dim :foreground ,fg-special-mild))) `(next-error ((,class :inherit modus-themes-subtle-red :extend t))) `(pgtk-im-0 ((,class :inherit modus-themes-refine-cyan))) + `(read-multiple-choice-face ((,class :inherit (bold modus-themes-mark-alt)))) `(rectangle-preview ((,class :inherit modus-themes-special-warm))) `(region ((,class ,@(modus-themes--region bg-region fg-main bg-hl-alt-intense bg-region-accent @@ -4532,9 +4534,9 @@ by virtue of calling either of `modus-themes-load-operandi' and `(font-latex-string-face ((,class :inherit font-lock-string-face))) `(font-latex-subscript-face ((,class :height 0.95))) `(font-latex-superscript-face ((,class :height 0.95))) + `(font-latex-underline-face ((,class :inherit underline))) `(font-latex-verbatim-face ((,class :inherit modus-themes-markup-verbatim))) `(font-latex-warning-face ((,class :inherit font-lock-warning-face))) - `(tex-match ((,class :foreground ,blue-alt-other))) `(tex-verbatim ((,class :inherit modus-themes-markup-verbatim))) `(texinfo-heading ((,class :foreground ,magenta))) `(TeX-error-description-error ((,class :inherit error))) @@ -4657,6 +4659,18 @@ by virtue of calling either of `modus-themes-load-operandi' and `(calibredb-mark-face ((,class :inherit modus-themes-mark-sel))) `(calibredb-size-face (( ))) `(calibredb-tag-face ((,class :foreground ,magenta-alt-faint))) +;;;;; centaur-tabs + `(centaur-tabs-active-bar-face ((,class :background ,blue-active))) + `(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground ,red-active :underline t))) + `(centaur-tabs-close-selected ((,class :inherit centaur-tabs-selected))) + `(centaur-tabs-close-unselected ((,class :inherit centaur-tabs-unselected))) + `(centaur-tabs-modified-marker-selected ((,class :inherit centaur-tabs-selected))) + `(centaur-tabs-modified-marker-unselected ((,class :inherit centaur-tabs-unselected))) + `(centaur-tabs-default ((,class :background ,bg-main))) + `(centaur-tabs-selected ((,class :inherit modus-themes-tab-active))) + `(centaur-tabs-selected-modified ((,class :inherit (italic centaur-tabs-selected)))) + `(centaur-tabs-unselected ((,class :inherit modus-themes-tab-inactive))) + `(centaur-tabs-unselected-modified ((,class :inherit (italic centaur-tabs-unselected)))) ;;;;; cfrs `(cfrs-border-color ((,class :background ,fg-window-divider-inner))) ;;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log') @@ -4669,6 +4683,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(change-log-list ((,class :foreground ,magenta-alt))) `(change-log-name ((,class :foreground ,magenta-alt-other))) `(log-edit-header ((,class :foreground ,fg-special-warm))) + `(log-edit-headers-separator ((,class :height 1 :background ,fg-window-divider-inner :extend t))) `(log-edit-summary ((,class :inherit bold :foreground ,blue))) `(log-edit-unknown-header ((,class :inherit shadow))) `(log-view-commit-body ((,class :foreground ,blue-nuanced-fg))) @@ -4743,6 +4758,8 @@ by virtue of calling either of `modus-themes-load-operandi' and `(company-preview-common ((,class :inherit company-echo-common))) `(company-preview-search ((,class :inherit modus-themes-special-calm))) `(company-template-field ((,class :inherit modus-themes-intense-magenta))) + `(company-scrollbar-bg ((,class :background ,bg-active))) + `(company-scrollbar-fg ((,class :background ,fg-active))) `(company-tooltip ((,class :background ,bg-alt))) `(company-tooltip-annotation ((,class :inherit completions-annotations))) `(company-tooltip-common ((,class :inherit company-echo-common))) @@ -4824,6 +4841,13 @@ by virtue of calling either of `modus-themes-load-operandi' and `(cperl-nonoverridable-face ((,class :foreground unspecified))) `(cperl-array-face ((,class :inherit font-lock-keyword-face))) `(cperl-hash-face ((,class :inherit font-lock-variable-name-face))) +;;;;; crontab-mode + `(crontab-minute ((,class :foreground ,blue-alt))) + `(crontab-hour ((,class :foreground ,magenta-alt-other))) + `(crontab-month-day ((,class :foreground ,magenta-alt))) + `(crontab-month ((,class :foreground ,blue))) + `(crontab-week-day ((,class :foreground ,cyan))) + `(crontab-predefined ((,class :foreground ,blue-alt))) ;;;;; css-mode `(css-property ((,class :inherit font-lock-type-face))) `(css-selector ((,class :inherit font-lock-keyword-face))) @@ -5041,7 +5065,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(diredp-tagged-autofile-name ((,class :inherit modus-themes-refine-magenta))) `(diredp-write-priv ((,class :foreground ,cyan))) ;;;;; display-fill-column-indicator-mode - `(fill-column-indicator ((,class :height 1 :background ,bg-inactive :foreground ,bg-inactive))) + `(fill-column-indicator ((,class :height 1 :background ,bg-region :foreground ,bg-region))) ;;;;; doom-modeline `(doom-modeline-bar ((,class :inherit modus-themes-active-blue))) `(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground ,bg-main))) @@ -5608,7 +5632,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(gnus-summary-low-read ((,class :inherit italic :foreground ,fg-alt))) `(gnus-summary-low-ticked ((,class :inherit italic :foreground ,red-refine-fg))) `(gnus-summary-low-undownloaded ((,class :inherit italic :foreground ,yellow-refine-fg))) - `(gnus-summary-low-unread ((,class :inherit bold :foreground ,fg-special-cold))) + `(gnus-summary-low-unread ((,class :inherit italic :foreground ,fg-special-cold))) `(gnus-summary-normal-ancient ((,class :foreground ,fg-special-calm))) `(gnus-summary-normal-read ((,class :inherit shadow))) `(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other))) @@ -6723,6 +6747,9 @@ by virtue of calling either of `modus-themes-load-operandi' and `(powerline-evil-operator-face ((,class :inherit modus-themes-active-yellow))) `(powerline-evil-replace-face ((,class :inherit modus-themes-active-red))) `(powerline-evil-visual-face ((,class :inherit modus-themes-active-cyan))) +;;;;; prescient + `(prescient-primary-highlight ((,class :inherit modus-themes-completion-match-0))) + `(prescient-secondary-highlight ((,class :inherit modus-themes-completion-match-1))) ;;;;; proced `(proced-mark ((,class :inherit modus-themes-mark-symbol))) `(proced-marked ((,class :inherit modus-themes-mark-alt))) @@ -6841,9 +6868,6 @@ by virtue of calling either of `modus-themes-load-operandi' and `(selectrum-mouse-highlight ((,class :inherit highlight))) `(selectrum-quick-keys-highlight ((,class :inherit bold :background ,bg-char-0))) `(selectrum-quick-keys-match ((,class :inherit bold :background ,bg-char-1))) -;;;;; selectrum-prescient - `(selectrum-prescient-primary-highlight ((,class :inherit modus-themes-completion-match-0))) - `(selectrum-prescient-secondary-highlight ((,class :inherit modus-themes-completion-match-1))) ;;;;; semantic `(semantic-complete-inline-face ((,class :foreground ,fg-special-warm :underline t))) `(semantic-decoration-on-fileless-includes ((,class :inherit modus-themes-refine-green))) @@ -6988,6 +7012,8 @@ by virtue of calling either of `modus-themes-load-operandi' and `(speedbar-selected-face ((,class :inherit bold :foreground ,cyan))) `(speedbar-separator-face ((,class :inherit modus-themes-intense-neutral))) `(speedbar-tag-face ((,class :foreground ,yellow-alt-other))) +;;;;; spell-fu + `(spell-fu-incorrect-face ((,class :inherit modus-themes-lang-error))) ;;;;; stripes `(stripes ((,class :background ,bg-alt))) ;;;;; suggest @@ -7526,7 +7552,7 @@ by virtue of calling either of `modus-themes-load-operandi' and `(xterm-color-names-bright ["gray35" ,red-alt ,green-alt ,yellow-alt ,blue-alt ,magenta-alt ,cyan-alt "white"]) (if (or (eq modus-themes-org-blocks 'tinted-background) (eq modus-themes-org-blocks 'rainbow)) - `(org-src-block-faces ; TODO this list should be expanded + `(org-src-block-faces `(("emacs-lisp" modus-themes-nuanced-magenta) ("elisp" modus-themes-nuanced-magenta) ("clojure" modus-themes-nuanced-magenta) diff --git a/etc/themes/modus-vivendi-theme.el b/etc/themes/modus-vivendi-theme.el index ba75a2527da..0983e26c786 100644 --- a/etc/themes/modus-vivendi-theme.el +++ b/etc/themes/modus-vivendi-theme.el @@ -6,7 +6,7 @@ ;; Maintainer: Modus-Themes Development <~protesilaos/modus-themes@lists.sr.ht> ;; URL: https://git.sr.ht/~protesilaos/modus-themes ;; Mailing-List: https://lists.sr.ht/~protesilaos/modus-themes -;; Version: 2.6.0 +;; Version: 2.7.1 ;; Package-Requires: ((emacs "27.1")) ;; Keywords: faces, theme, accessibility -- 2.39.2