mirror of
https://github.com/protesilaos/modus-themes.git
synced 2026-09-10 07:16:30 -04:00
Make sure Ediff faces do not depend on diff-mode
Thanks to Bernd Rellermeyer for pointing out this implicit dependency in issue 68 on the GitHub mirror: <https://github.com/protesilaos/modus-themes/issues/68>.
This commit is contained in:
Protesilaos Stavrou
parent
f4282839d8
commit
18e36949cf
|
|
@ -5236,35 +5236,35 @@ Ideas and user feedback
|
|||
Pirogov, 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.
|
||||
Contovounesios, Burgess Chang, Charlotte Van Petegem, 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, Imran Khan, Iris Garcia, Ivan
|
||||
Popovych, James Ferguson, 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,
|
||||
Kevin Kainan Li, Kostadin Ninev, Laith Bahodi, 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, 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, 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, derek-upham,
|
||||
doolio, fleimgruber, gitrj95, iSeeU, jixiuf, okamsn, pRot0ta1p,
|
||||
soaringbird, tumashu, wakamenod.
|
||||
Contovounesios, Bernd Rellermeyer, Burgess Chang, Charlotte Van
|
||||
Petegem, 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, Imran Khan, Iris
|
||||
Garcia, Ivan Popovych, James Ferguson, 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, Kevin Kainan Li, Kostadin Ninev, Laith Bahodi, 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, 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, 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,
|
||||
derek-upham, doolio, fleimgruber, gitrj95, iSeeU, jixiuf, okamsn,
|
||||
pRot0ta1p, soaringbird, tumashu, wakamenod.
|
||||
|
||||
Packaging
|
||||
Basil L. Contovounesios, Eli Zaretskii, Glenn Morris, Mauro Aranda,
|
||||
|
|
@ -6017,11 +6017,11 @@ Node: Sources of the themes209790
|
|||
Node: Issues you can help with210684
|
||||
Node: Patches require copyright assignment to the FSF212075
|
||||
Node: Acknowledgements214295
|
||||
Node: GNU Free Documentation License218207
|
||||
Node: Indices243571
|
||||
Node: Function index243750
|
||||
Node: Variable index244933
|
||||
Node: Concept index246832
|
||||
Node: GNU Free Documentation License218226
|
||||
Node: Indices243590
|
||||
Node: Function index243769
|
||||
Node: Variable index244952
|
||||
Node: Concept index246851
|
||||
|
||||
End Tag Table
|
||||
|
||||
|
|
|
|||
|
|
@ -5119,35 +5119,35 @@ The Modus themes are a collective effort. Every bit of work matters.
|
|||
Adrian Manea, Aleksei Pirogov, 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, Charlotte Van Petegem, 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,
|
||||
Imran Khan, Iris Garcia, Ivan Popovych, James Ferguson, 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, Kevin Kainan Li, Kostadin Ninev,
|
||||
Laith Bahodi, 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, 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, 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, derek-upham,
|
||||
doolio, fleimgruber, gitrj95, iSeeU, jixiuf, okamsn, pRot0ta1p,
|
||||
soaringbird, tumashu, wakamenod.
|
||||
Augusto Stoffel, Basil L.{{{space()}}} Contovounesios, Bernd
|
||||
Rellermeyer, Burgess Chang, Charlotte Van Petegem, 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, Imran Khan, Iris Garcia, Ivan Popovych, James
|
||||
Ferguson, 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, Kevin Kainan Li,
|
||||
Kostadin Ninev, Laith Bahodi, 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, 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, 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,
|
||||
derek-upham, doolio, fleimgruber, gitrj95, iSeeU, jixiuf, okamsn,
|
||||
pRot0ta1p, soaringbird, tumashu, wakamenod.
|
||||
|
||||
+ Packaging :: Basil L.{{{space()}}} Contovounesios, Eli Zaretskii,
|
||||
Glenn Morris, Mauro Aranda, Richard Stallman, Stefan Kangas (core
|
||||
|
|
|
|||
|
|
@ -2127,10 +2127,10 @@ FG and BG are the main colors."
|
|||
`(doom-modeline-urgent ((,c :inherit bold-italic :foreground ,modeline-err)))
|
||||
`(doom-modeline-warning ((,c :inherit warning)))
|
||||
;;;;; ediff
|
||||
`(ediff-current-diff-A ((,c :inherit diff-removed)))
|
||||
`(ediff-current-diff-A ((,c :background ,bg-removed :foreground ,fg-removed)))
|
||||
`(ediff-current-diff-Ancestor ((,c :background ,bg-region))) ; TODO 2022-11-29: Needs review
|
||||
`(ediff-current-diff-B ((,c :inherit diff-added)))
|
||||
`(ediff-current-diff-C ((,c :inherit diff-changed)))
|
||||
`(ediff-current-diff-B ((,c :background ,bg-added :foreground ,fg-added)))
|
||||
`(ediff-current-diff-C ((,c :background ,bg-changed :foreground ,fg-changed)))
|
||||
`(ediff-even-diff-A ((,c :background ,bg-diff-context)))
|
||||
`(ediff-even-diff-Ancestor ((,c :background ,bg-diff-context)))
|
||||
`(ediff-even-diff-B ((,c :background ,bg-diff-context)))
|
||||
|
|
|
|||
Loading…
Reference in a new issue