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.
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,
Mike Crowe, Morgan Smith, Morgan Willcock, Morten Kjeldgaard,
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, Pranshu Sharma, Przemysław Kryger, Robert
Hepple, Roman Rudakov, Roshan Shariff, 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
Lennart C. Karssen, Lucas Jimenez, 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, Mike Crowe, Morgan Smith, Morgan Willcock, Morten
Kjeldgaard, 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, Pranshu Sharma, Przemysław Kryger,
Robert Hepple, Roman Rudakov, Roshan Shariff, 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, Troy Brown, Uri Sharf, Utkarsh Singh,
Vincent Foley, Yuta Yamamoto, Zoltan Kiraly. As well as users:
Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Fredrik,
@ -7506,11 +7506,11 @@ Node: Sources of the themes280883
Node: Issues you can help with281624
Node: Patches require copyright assignment to the FSF282946
Node: Acknowledgements285160
Node: GNU Free Documentation License290075
Node: Indices315238
Node: Function index315417
Node: Variable index320026
Node: Concept index324603
Node: GNU Free Documentation License290090
Node: Indices315253
Node: Function index315432
Node: Variable index320041
Node: Concept index324618

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,
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, Mike Crowe, Morgan Smith, Morgan
Willcock, Morten Kjeldgaard, 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, Pranshu Sharma,
Przemysław Kryger, Robert Hepple, Roman Rudakov, Roshan Shariff,
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, Troy Brown, Uri Sharf,
Utkarsh Singh, Vincent Foley, Yuta Yamamoto, Zoltan Kiraly. As well
as users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux,
Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, TitusMu, Trey,
aikrahguzar, amano-kenji, baconabo, bangedorrunt, bepolymathe,
bit9tream, case-lambda, chainedghost, derek-upham, doolio,
fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
Lasse Lindner, Len Trigg, Lennart C.{{{space()}}} Karssen, Lucas
Jimenez, 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, Mike Crowe, Morgan Smith,
Morgan Willcock, Morten Kjeldgaard, 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, Pranshu
Sharma, Przemysław Kryger, Robert Hepple, Roman Rudakov, Roshan
Shariff, 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, Troy
Brown, Uri Sharf, Utkarsh Singh, Vincent Foley, Yuta Yamamoto,
Zoltan Kiraly. As well as users: Ben, CsBigDataHub1, Emacs Contrib,
Eugene, Fourchaux, Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42,
TitusMu, Trey, aikrahguzar, amano-kenji, baconabo, bangedorrunt,
bepolymathe, bit9tream, case-lambda, chainedghost, derek-upham,
doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
pedro-nonfree, pRot0ta1p, realazy, shimeike, shipmints, soaringbird,
tumashu, vpxyz, wakamenod.

3
modus-themes.el
View file

@ -3866,6 +3866,7 @@ Else return (append OVERRIDES USER CORE)."
user-palette-name
(boundp 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 (when (and with-overrides
overrides-palette-name
@ -3873,7 +3874,7 @@ Else return (append OVERRIDES USER CORE)."
(symbol-value overrides-palette-name)))
(all-overrides (when with-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)
"Return palette value of active `modus-themes-get-themes' THEME.