With a recent update, my emacs-feature-loader started to break with
the following error:
https://paste.sr.ht/~ngraves/7e57ed90e8dcd7a7797b18114bb878a5e95a7571

This patch is a fix that is not perfect, but that seem to work
correctly. It disables load-theme in some specific cases (when
`(not (graphic-display-p))` ) and uses the
server-after-make-frame-hook to ensure the theme is enabled when
running the server.

This isn't optimized (we should probably check with unless and
custom-enabled-themes before trying to enable-theme), but it was
painful to fix and I wanted Andrew to review this before optimizing if
useful.

Nicolas Graves (1):
  rde: modus-themes: Fix emacs-feature-loader build

 src/rde/features/emacs-xyz.scm | 7 ++++++-
 src/rde/features/fontutils.scm | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

-- 
2.45.2

---
 src/rde/features/emacs-xyz.scm | 7 ++++++-
 src/rde/features/fontutils.scm | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
index 1d54dbcb..2de8e25d 100644
--- a/src/rde/features/emacs-xyz.scm
+++ b/src/rde/features/emacs-xyz.scm
@@ -462,7 +462,12 @@ different level headings will have different size."
                                                       (7 . (0.9))
                                                       (8 . (0.9))))))
                 '()))
-        (load-theme ',theme t))
+        (load-theme ',theme t (not (display-graphic-p)))
+        ,@(if (get-value 'emacs-server-mode? config #f)
+              `((add-hook 'server-after-make-frame-hook
+                             (lambda ()
+                               (enable-theme ',theme))))
+              '()))
       #:elisp-packages (list emacs-modus-themes)
       #:summary "Modus Themes extensions"
       #:commentary "Customizations to Modus Themes, the elegant,
diff --git a/src/rde/features/fontutils.scm b/src/rde/features/fontutils.scm
index dfe81f5c..e2c4cc2a 100644
--- a/src/rde/features/fontutils.scm
+++ b/src/rde/features/fontutils.scm
@@ -194,6 +194,7 @@ font-monospace default value, and it will be ignored if
                             (font-spec :name ,(font-name font-unicode))))
         (setq use-default-font-for-symbols nil)
         (require 'fontaine)
+        (setq fontaine-current-preset t)
         (setq fontaine-presets
               '((t
                  :default-family ,(font-name font-monospace)
-- 
2.45.2

rde/patches/.build.yml: SUCCESS in 3m20s

[Fix emacs-feature-loader build][0] v2 from [Nicolas Graves][1]

[0]: https://lists.sr.ht/~abcdw/rde-devel/patches/53528
[1]: ngraves@ngraves.fr

✓ #1261088 SUCCESS rde/patches/.build.yml https://builds.sr.ht/~abcdw/job/1261088

On 2024-06-26 16:33, Nicolas Graves wrote:

> With a recent update, my emacs-feature-loader started to break with
> the following error:
> https://paste.sr.ht/~ngraves/7e57ed90e8dcd7a7797b18114bb878a5e95a7571
>
> This patch is a fix that is not perfect, but that seem to work
> correctly. It disables load-theme in some specific cases (when
> `(not (graphic-display-p))` ) and uses the
> server-after-make-frame-hook to ensure the theme is enabled when
> running the server.
>
> This isn't optimized (we should probably check with unless and
> custom-enabled-themes before trying to enable-theme), but it was
> painful to fix and I wanted Andrew to review this before optimizing if
> useful.
>
> Nicolas Graves (1):
>   rde: modus-themes: Fix emacs-feature-loader build
>
>  src/rde/features/emacs-xyz.scm | 7 ++++++-
>  src/rde/features/fontutils.scm | 1 +
>  2 files changed, 7 insertions(+), 1 deletion(-)

I think I merged the same one, marking as superseded.

Let me know, if I didn't notice something.

-- 
Best regards,
Andrew Tropin

On 2024-07-01 16:12, Andrew Tropin wrote:

> I think I merged the same one, marking as superseded.
>
> Let me know, if I didn't notice something.

Yes, it was indeed the same, it's just that I had forgotten the cover
letter, IIRC.

-- 
Best regards,
Nicolas Graves