[bug#78599,6/7] gnu: emacs-origami: Fix invalid-face-box.

Message ID 20250526230530.18545-6-ngraves@ngraves.fr
State New
Headers
Series Last patches for emacs-team |

Commit Message

Nicolas Graves May 26, 2025, 11:05 p.m. UTC
  This fixes face errors in the emacs-keystore-mode dependent package on
emacs@30.

* gnu/packages/emacs-xyz.scm (emacs-origami)[source]<snippet>: Adapt
to emacs@30 face API (:color unspecified has to be changed to :color
nil).
---
 gnu/packages/emacs-xyz.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
  

Patch

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 32e105288a..8ddf82098b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35778,7 +35778,10 @@  (define-public emacs-origami
                       (("\\(require 'cl\\)")
                        "(require 'cl-lib)")
                       (("(destructuring-bind|remove-if)" all)
-                       (string-append "cl-" all))))))
+                       (string-append "cl-" all))
+                      (("\\(face-attribute 'highlight :background\\)") "\
+(let ((color (face-attribute 'highlight :background)))
+  (and color (not (eq color 'unspecified)) color))")))))
       (build-system emacs-build-system)
       (propagated-inputs (list emacs-dash emacs-s))
       (home-page "https://github.com/gregsexton/origami.el")