emacs/protesilaos.modus-themes
1
0
Fork 0
mirror of https://github.com/protesilaos/modus-themes.git synced 2026-09-10 07:16:30 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include the modus-themes-common-palette-user in the resulting palette (Emacs bug#81640)

Browse source 
Thanks to Lucas Jimenez for reporting the bug on the Emacs bug tracker.
This commit is contained in:
Protesilaos 2026-08-29 22:26:55 +03:00
parent b86cace435
commit 9a3cd56cc2
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
3 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
doc/modus-themes.info
View file

@ -6636,20 +6636,20 @@ Ideas and user feedback
John Wick, Jonas Collberg, Jorge Morais, Joshua O'Connor, Julio C. John Wick, Jonas Collberg, Jorge Morais, Joshua O'Connor, Julio C.
Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec, Kevin Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec, Kevin
Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse Lindner, Len Trigg, Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse Lindner, Len Trigg,
Lennart C. Karssen, Luis Miguel Castañeda, Magne Hov, Manuel Lennart C. Karssen, Lucas Jimenez, Luis Miguel Castañeda, Magne
Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark Simpson, Hov, Manuel Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark
Marko Kocic, Markus Beppler, Matt Armstrong, Matthias Fuchs, Simpson, Marko Kocic, Markus Beppler, Matt Armstrong, Matthias
Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael Goldenberg, Fuchs, Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael
Mike Crowe, Morgan Smith, Morgan Willcock, Morten Kjeldgaard, Goldenberg, Mike Crowe, Morgan Smith, Morgan Willcock, Morten
Murilo Pereira, Nicky van Foreest, Nicolas De Jaeghere, Nicolas Kjeldgaard, Murilo Pereira, Nicky van Foreest, Nicolas De Jaeghere,
Semrau, Olaf Meeuwissen, Oliver Epper, Pablo Stafforini, Paul Nicolas Semrau, Olaf Meeuwissen, Oliver Epper, Pablo Stafforini,
Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu, Philip Kaludercic, Paul Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu, Philip
Pierre Téchoueyres, Pranshu Sharma, Przemysław Kryger, Robert Kaludercic, Pierre Téchoueyres, Pranshu Sharma, Przemysław Kryger,
Hepple, Roman Rudakov, Roshan Shariff, Russell Sim, Ryan Phillips, Robert Hepple, Roman Rudakov, Roshan Shariff, Russell Sim, Ryan
Rytis Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel Culpepper, Phillips, Rytis Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel
Saša Janiška, Shreyas Ragavan, Simon Pugnet, Stéphane Marks, Steve Culpepper, Saša Janiška, Shreyas Ragavan, Simon Pugnet, Stéphane
Downey, Tassilo Horn, Thanos Apollo, Thibaut Verron, Thomas Marks, Steve Downey, Tassilo Horn, Thanos Apollo, Thibaut Verron,
Heartman, Togan Muftuoglu, Tony Zorman, Trey Merkley, Tomasz Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey Merkley, Tomasz
Hołubowicz, Toon Claes, Troy Brown, Uri Sharf, Utkarsh Singh, Hołubowicz, Toon Claes, Troy Brown, Uri Sharf, Utkarsh Singh,
Vincent Foley, Yuta Yamamoto, Zoltan Kiraly. As well as users: Vincent Foley, Yuta Yamamoto, Zoltan Kiraly. As well as users:
Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Fredrik, Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Fredrik,
@ -7506,11 +7506,11 @@ Node: Sources of the themes280883
Node: Issues you can help with281624 Node: Issues you can help with281624
Node: Patches require copyright assignment to the FSF282946 Node: Patches require copyright assignment to the FSF282946
Node: Acknowledgements285160 Node: Acknowledgements285160
Node: GNU Free Documentation License290075 Node: GNU Free Documentation License290090
Node: Indices315238 Node: Indices315253
Node: Function index315417 Node: Function index315432
Node: Variable index320026 Node: Variable index320041
Node: Concept index324603 Node: Concept index324618
 
End Tag Table End Tag Table

42
doc/modus-themes.org
View file

@ -6414,27 +6414,27 @@ The Modus themes are a collective effort. Every bit of work matters.
John Haman, John Sullivan, John Wick, Jonas Collberg, Jorge Morais, John Haman, John Sullivan, John Wick, Jonas Collberg, Jorge Morais,
Joshua O'Connor, Julio C. Villasante, Kenta Usami, Kevin Fleming, Joshua O'Connor, Julio C. Villasante, Kenta Usami, Kevin Fleming,
Kévin Le Gouguec, Kevin Kainan Li, Kostadin Ninev, Laith Bahodi, Kévin Le Gouguec, Kevin Kainan Li, Kostadin Ninev, Laith Bahodi,
Lasse Lindner, Len Trigg, Lennart C.{{{space()}}} Karssen, Luis Lasse Lindner, Len Trigg, Lennart C.{{{space()}}} Karssen, Lucas
Miguel Castañeda, Magne Hov, Manuel Giraud, Manuel Uberti, Mark Jimenez, Luis Miguel Castañeda, Magne Hov, Manuel Giraud, Manuel
Bestley, Mark Burton, Mark Simpson, Marko Kocic, Markus Beppler, Uberti, Mark Bestley, Mark Burton, Mark Simpson, Marko Kocic, Markus
Matt Armstrong, Matthias Fuchs, Mattias Engdegård, Mauro Aranda, Beppler, Matt Armstrong, Matthias Fuchs, Mattias Engdegård, Mauro
Maxime Tréca, Michael Goldenberg, Mike Crowe, Morgan Smith, Morgan Aranda, Maxime Tréca, Michael Goldenberg, Mike Crowe, Morgan Smith,
Willcock, Morten Kjeldgaard, Murilo Pereira, Nicky van Foreest, Morgan Willcock, Morten Kjeldgaard, Murilo Pereira, Nicky van
Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen, Oliver Epper, Foreest, Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen,
Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete Kazmier, Peter Oliver Epper, Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete
Wu, Philip Kaludercic, Pierre Téchoueyres, Pranshu Sharma, Kazmier, Peter Wu, Philip Kaludercic, Pierre Téchoueyres, Pranshu
Przemysław Kryger, Robert Hepple, Roman Rudakov, Roshan Shariff, Sharma, Przemysław Kryger, Robert Hepple, Roman Rudakov, Roshan
Russell Sim, Ryan Phillips, Rytis Paškauskas, Rudolf Adamkovič, Sam Shariff, Russell Sim, Ryan Phillips, Rytis Paškauskas, Rudolf
Kleinman, Samuel Culpepper, Saša Janiška, Shreyas Ragavan, Simon Adamkovič, Sam Kleinman, Samuel Culpepper, Saša Janiška, Shreyas
Pugnet, Stéphane Marks, Steve Downey, Tassilo Horn, Thanos Apollo, Ragavan, Simon Pugnet, Stéphane Marks, Steve Downey, Tassilo Horn,
Thibaut Verron, Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey Thanos Apollo, Thibaut Verron, Thomas Heartman, Togan Muftuoglu,
Merkley, Tomasz Hołubowicz, Toon Claes, Troy Brown, Uri Sharf, Tony Zorman, Trey Merkley, Tomasz Hołubowicz, Toon Claes, Troy
Utkarsh Singh, Vincent Foley, Yuta Yamamoto, Zoltan Kiraly. As well Brown, Uri Sharf, Utkarsh Singh, Vincent Foley, Yuta Yamamoto,
as users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Zoltan Kiraly. As well as users: Ben, CsBigDataHub1, Emacs Contrib,
Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, TitusMu, Trey, Eugene, Fourchaux, Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42,
aikrahguzar, amano-kenji, baconabo, bangedorrunt, bepolymathe, TitusMu, Trey, aikrahguzar, amano-kenji, baconabo, bangedorrunt,
bit9tream, case-lambda, chainedghost, derek-upham, doolio, bepolymathe, bit9tream, case-lambda, chainedghost, derek-upham,
fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn, doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
pedro-nonfree, pRot0ta1p, realazy, shimeike, shipmints, soaringbird, pedro-nonfree, pRot0ta1p, realazy, shimeike, shipmints, soaringbird,
tumashu, vpxyz, wakamenod. tumashu, vpxyz, wakamenod.

3
modus-themes.el
View file

@ -3866,6 +3866,7 @@ Else return (append OVERRIDES USER CORE)."
user-palette-name user-palette-name
(boundp user-palette-name)) (boundp user-palette-name))
(symbol-value user-palette-name))) (symbol-value user-palette-name)))
(all-user-defined (append user-palette modus-themes-common-palette-user))
(overrides-palette-name (plist-get properties :modus-overrides-palette)) (overrides-palette-name (plist-get properties :modus-overrides-palette))
(overrides-palette (when (and with-overrides (overrides-palette (when (and with-overrides
overrides-palette-name overrides-palette-name
@ -3873,7 +3874,7 @@ Else return (append OVERRIDES USER CORE)."
(symbol-value overrides-palette-name))) (symbol-value overrides-palette-name)))
(all-overrides (when with-overrides (all-overrides (when with-overrides
(append overrides-palette modus-themes-common-palette-overrides)))) (append overrides-palette modus-themes-common-palette-overrides))))
(append all-overrides user-palette core-palette))))) (append all-overrides all-user-defined core-palette)))))
(defun modus-themes-get-theme-palette (&optional theme with-overrides with-user-palette) (defun modus-themes-get-theme-palette (&optional theme with-overrides with-user-palette)
"Return palette value of active `modus-themes-get-themes' THEME. "Return palette value of active `modus-themes-get-themes' THEME.