branch: externals/modus-themes
commit 3b0850883ab1f7c5446fb12217e779426565741c
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Stop using readable-foreground-color for the org-habit faces
It breaks the themes when they loaded via the early-init.el, as
reported by Gaston Cabotin in issue 174:
<https://github.com/protesilaos/modus-themes/issues/174>.
---
doc/modus-themes.info | 67 ++++++++++++++++++++++++++-------------------------
doc/modus-themes.org | 56 +++++++++++++++++++++---------------------
modus-themes.el | 22 ++++++++++-------
3 files changed, 75 insertions(+), 70 deletions(-)
diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index c6c7ed4dc2..658134281e 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -6432,34 +6432,35 @@ Ideas and user feedback
Tietze, Christopher Dimech, Christopher League, Damien Cassou,
Daniel Mendler, Dario Gjorgjevski, David Edmondson, Davor Rotim,
Divan Santana, Eliraz Kedmi, Emanuele Michele Alberto Monterosso,
- Eshel Yaron, Farasha Euker, Feng Shu, Filippo Argiolas, Gautier
- Ponsinet, Gerry Agbobada, Gianluca Recchia, Gonçalo Marrafa,
- Guilherme Semente, Gustavo Barros, Hörmetjan Yiltiz, Ilja Kocken,
- Imran Khan, Iris Garcia, Ivan Popovych, Jabir Ali Ouassou, James
- Ferguson, Jeremy Friesen, Jerry Zhang, Johannes Grødem, John Haman,
- John Sullivan, John Wick, Jonas Collberg, Jorge Morais, Joshua
- O'Connor, Julio C. Villasante, Kenta Usami, Kevin Fleming, Kévin
- Le Gouguec, Kevin Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse
- Lindner, Len Trigg, Lennart C. Karssen, Luis Miguel Castañeda,
- Magne Hov, Manuel Giraud, Manuel Uberti, Mark Bestley, Mark Burton,
- Mark Simpson, Marko Kocic, Markus Beppler, Matt Armstrong, Matthias
- Fuchs, Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael
- Goldenberg, Morgan Smith, Morgan Willcock, Murilo Pereira, Nicky
- van Foreest, Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen,
- Oliver Epper, Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete
- Kazmier, Peter Wu, Philip Kaludercic, Pierre Téchoueyres,
- Przemysław Kryger, Robert Hepple, Roman Rudakov, Russell Sim, Ryan
- Phillips, Rytis Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel
- Culpepper, Saša Janiška, Shreyas Ragavan, Simon Pugnet, Stéphane
- Marks, Steve Downey, Tassilo Horn, Thanos Apollo, Thibaut Verron,
- Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey Merkley, Tomasz
- Hołubowicz, Toon Claes, Uri Sharf, Utkarsh Singh, Vincent Foley,
- Zoltan Kiraly. As well as users: Ben, CsBigDataHub1, Emacs
- Contrib, Eugene, Fourchaux, Fredrik, Moesasji, Nick, Summer Emacs,
- TheBlob42, TitusMu, Trey, bepolymathe, bit9tream, bangedorrunt,
- case-lambda, chainedghost, derek-upham, doolio, fleimgruber,
- gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn, pedro-nonfree, pRot0ta1p,
- shimeike, shipmints, soaringbird, tumashu, wakamenod.
+ Eshel Yaron, Farasha Euker, Feng Shu, Filippo Argiolas, Gaston
+ Cabotin, Gautier Ponsinet, Gerry Agbobada, Gianluca Recchia,
+ Gonçalo Marrafa, Guilherme Semente, Gustavo Barros, Hörmetjan
+ Yiltiz, Ilja Kocken, Imran Khan, Iris Garcia, Ivan Popovych, Jabir
+ Ali Ouassou, James Ferguson, Jeremy Friesen, Jerry Zhang, Johannes
+ Grødem, John Haman, John Sullivan, John Wick, Jonas Collberg, Jorge
+ Morais, Joshua O'Connor, Julio C. Villasante, Kenta Usami, Kevin
+ Fleming, Kévin Le Gouguec, Kevin Kainan Li, Kostadin Ninev, Laith
+ Bahodi, Lasse Lindner, Len Trigg, Lennart C. Karssen, Luis Miguel
+ Castañeda, Magne Hov, Manuel Giraud, Manuel Uberti, Mark Bestley,
+ Mark Burton, Mark Simpson, Marko Kocic, Markus Beppler, Matt
+ Armstrong, Matthias Fuchs, Mattias Engdegård, Mauro Aranda, Maxime
+ Tréca, Michael Goldenberg, Morgan Smith, Morgan Willcock, Murilo
+ Pereira, Nicky van Foreest, Nicolas De Jaeghere, Nicolas Semrau,
+ Olaf Meeuwissen, Oliver Epper, Pablo Stafforini, Paul Poloskov,
+ Pengji Zhang, Pete Kazmier, Peter Wu, Philip Kaludercic, Pierre
+ Téchoueyres, Przemysław Kryger, Robert Hepple, Roman Rudakov,
+ Russell Sim, Ryan Phillips, Rytis Paškauskas, Rudolf Adamkovič, Sam
+ Kleinman, Samuel Culpepper, Saša Janiška, Shreyas Ragavan, Simon
+ Pugnet, Stéphane Marks, Steve Downey, Tassilo Horn, Thanos Apollo,
+ Thibaut Verron, Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey
+ Merkley, Tomasz Hołubowicz, Toon Claes, Uri Sharf, Utkarsh Singh,
+ Vincent Foley, Zoltan Kiraly. As well as users: Ben,
+ CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Fredrik, Moesasji,
+ Nick, Summer Emacs, TheBlob42, TitusMu, Trey, bepolymathe,
+ bit9tream, bangedorrunt, case-lambda, chainedghost, derek-upham,
+ doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
+ pedro-nonfree, pRot0ta1p, shimeike, shipmints, soaringbird,
+ tumashu, wakamenod.
Packaging
Basil L. Contovounesios, Eli Zaretskii, Glenn Morris, Mauro Aranda,
@@ -7299,11 +7300,11 @@ Node: Sources of the themes268176
Node: Issues you can help with269072
Node: Patches require copyright assignment to the FSF270464
Node: Acknowledgements272686
-Node: GNU Free Documentation License277242
-Node: Indices302405
-Node: Function index302584
-Node: Variable index306779
-Node: Concept index311142
+Node: GNU Free Documentation License277263
+Node: Indices302426
+Node: Function index302605
+Node: Variable index306800
+Node: Concept index311163
End Tag Table
diff --git a/doc/modus-themes.org b/doc/modus-themes.org
index 1bdfcc9866..5fb307bc8d 100644
--- a/doc/modus-themes.org
+++ b/doc/modus-themes.org
@@ -6241,34 +6241,34 @@ The Modus themes are a collective effort. Every bit of
work matters.
Christopher League, Damien Cassou, Daniel Mendler, Dario
Gjorgjevski, David Edmondson, Davor Rotim, Divan Santana, Eliraz
Kedmi, Emanuele Michele Alberto Monterosso, Eshel Yaron, Farasha
- Euker, Feng Shu, Filippo Argiolas, Gautier Ponsinet, Gerry Agbobada,
- Gianluca Recchia, Gonçalo Marrafa, Guilherme Semente, Gustavo
- Barros, Hörmetjan Yiltiz, Ilja Kocken, Imran Khan, Iris Garcia, Ivan
- Popovych, Jabir Ali Ouassou, James Ferguson, Jeremy Friesen, Jerry
- Zhang, Johannes Grødem, John Haman, John Sullivan, John Wick, Jonas
- Collberg, Jorge Morais, Joshua O'Connor, Julio C. Villasante, Kenta
- Usami, Kevin Fleming, Kévin Le Gouguec, Kevin Kainan Li, Kostadin
- Ninev, Laith Bahodi, Lasse Lindner, Len Trigg, Lennart
- C.{{{space()}}} Karssen, Luis Miguel Castañeda, Magne Hov, Manuel
- Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark Simpson,
- Marko Kocic, Markus Beppler, Matt Armstrong, Matthias Fuchs, Mattias
- Engdegård, Mauro Aranda, Maxime Tréca, Michael Goldenberg, Morgan
- Smith, Morgan Willcock, Murilo Pereira, Nicky van Foreest, Nicolas
- De Jaeghere, Nicolas Semrau, Olaf Meeuwissen, Oliver Epper, Pablo
- Stafforini, Paul Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu,
- Philip Kaludercic, Pierre Téchoueyres, Przemysław Kryger, Robert
- Hepple, Roman Rudakov, Russell Sim, Ryan Phillips, Rytis Paškauskas,
- Rudolf Adamkovič, Sam Kleinman, Samuel Culpepper, Saša Janiška,
- Shreyas Ragavan, Simon Pugnet, Stéphane Marks, Steve Downey, Tassilo
- Horn, Thanos Apollo, Thibaut Verron, Thomas Heartman, Togan
- Muftuoglu, Tony Zorman, Trey Merkley, Tomasz Hołubowicz, Toon Claes,
- Uri Sharf, Utkarsh Singh, Vincent Foley, Zoltan Kiraly. As well as
- users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux,
- Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, TitusMu, Trey,
- bepolymathe, bit9tream, bangedorrunt, case-lambda, chainedghost,
- derek-upham, doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag,
- okamsn, pedro-nonfree, pRot0ta1p, shimeike, shipmints, soaringbird,
- tumashu, wakamenod.
+ Euker, Feng Shu, Filippo Argiolas, Gaston Cabotin, Gautier Ponsinet,
+ Gerry Agbobada, Gianluca Recchia, Gonçalo Marrafa, Guilherme
+ Semente, Gustavo Barros, Hörmetjan Yiltiz, Ilja Kocken, Imran Khan,
+ Iris Garcia, Ivan Popovych, Jabir Ali Ouassou, James Ferguson,
+ Jeremy Friesen, Jerry Zhang, Johannes Grødem, John Haman, John
+ Sullivan, John Wick, Jonas Collberg, Jorge Morais, Joshua O'Connor,
+ Julio C. Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec,
+ Kevin Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse Lindner, Len
+ Trigg, Lennart C.{{{space()}}} Karssen, Luis Miguel Castañeda, Magne
+ Hov, Manuel Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark
+ Simpson, Marko Kocic, Markus Beppler, Matt Armstrong, Matthias
+ Fuchs, Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael
+ Goldenberg, Morgan Smith, Morgan Willcock, Murilo Pereira, Nicky van
+ Foreest, Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen,
+ Oliver Epper, Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete
+ Kazmier, Peter Wu, Philip Kaludercic, Pierre Téchoueyres, Przemysław
+ Kryger, Robert Hepple, Roman Rudakov, Russell Sim, Ryan Phillips,
+ Rytis Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel Culpepper,
+ Saša Janiška, Shreyas Ragavan, Simon Pugnet, Stéphane Marks, Steve
+ Downey, Tassilo Horn, Thanos Apollo, Thibaut Verron, Thomas
+ Heartman, Togan Muftuoglu, Tony Zorman, Trey Merkley, Tomasz
+ Hołubowicz, Toon Claes, Uri Sharf, Utkarsh Singh, Vincent Foley,
+ Zoltan Kiraly. As well as users: Ben, CsBigDataHub1, Emacs Contrib,
+ Eugene, Fourchaux, Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42,
+ TitusMu, Trey, bepolymathe, bit9tream, bangedorrunt, case-lambda,
+ chainedghost, derek-upham, doolio, fleimgruber, gitrj95, iSeeU,
+ jixiuf, ltmsyvag, okamsn, pedro-nonfree, pRot0ta1p, shimeike,
+ shipmints, soaringbird, tumashu, wakamenod.
+ Packaging :: Basil L.{{{space()}}} Contovounesios, Eli Zaretskii,
Glenn Morris, Mauro Aranda, Richard Stallman, Stefan Kangas (core
diff --git a/modus-themes.el b/modus-themes.el
index 0de362dc2e..73285e30a7 100644
--- a/modus-themes.el
+++ b/modus-themes.el
@@ -6354,15 +6354,19 @@ FG and BG are the main colors."
`(org-verse ((,c :inherit modus-themes-fixed-pitch :background
,bg-prose-block-contents :extend t)))
`(org-warning ((,c :foreground ,warning)))
;;;;; org-habit
- ;; NOTE 2025-10-24: All foregrounds here are a special case.
- `(org-habit-alert-face ((,c :background ,bg-graph-yellow-0 :foreground
,(readable-foreground-color bg-graph-yellow-0))))
- `(org-habit-alert-future-face ((,c :background ,bg-graph-yellow-1
:foreground ,(readable-foreground-color bg-graph-yellow-1))))
- `(org-habit-clear-face ((,c :background ,bg-graph-blue-0 :foreground
,(readable-foreground-color bg-graph-blue-0))))
- `(org-habit-clear-future-face ((,c :background ,bg-graph-blue-1
:foreground ,(readable-foreground-color bg-graph-blue-1))))
- `(org-habit-overdue-face ((,c :background ,bg-graph-red-0 :foreground
,(readable-foreground-color bg-graph-red-0))))
- `(org-habit-overdue-future-face ((,c :background ,bg-graph-red-1
:foreground ,(readable-foreground-color bg-graph-red-1))))
- `(org-habit-ready-face ((,c :background ,bg-graph-green-0 :foreground
,(readable-foreground-color bg-graph-green-0))))
- `(org-habit-ready-future-face ((,c :background ,bg-graph-green-1
:foreground ,(readable-foreground-color bg-graph-green-1))))
+ ;; NOTE 2025-11-12: We used to have `readable-foreground-color'
+ ;; for the foreground values of these faces, but that function
+ ;; breaks the theme if it is loaded in the early-init.el. Maybe
+ ;; we can find a better solution. I do not want to introduce new
+ ;; palette entries or a new function just for these faces though.
+ `(org-habit-alert-face ((,c :background ,bg-graph-yellow-0)))
+ `(org-habit-alert-future-face ((,c :background ,bg-graph-yellow-1)))
+ `(org-habit-clear-face ((,c :background ,bg-graph-blue-0)))
+ `(org-habit-clear-future-face ((,c :background ,bg-graph-blue-1)))
+ `(org-habit-overdue-face ((,c :background ,bg-graph-red-0)))
+ `(org-habit-overdue-future-face ((,c :background ,bg-graph-red-1)))
+ `(org-habit-ready-face ((,c :background ,bg-graph-green-0)))
+ `(org-habit-ready-future-face ((,c :background ,bg-graph-green-1)))
;;;;; org-journal
`(org-journal-calendar-entry-face ((,c :inherit modus-themes-slant
:foreground ,date-common)))
`(org-journal-calendar-scheduled-face ((,c :inherit modus-themes-slant
:foreground ,date-scheduled-subtle)))
