GNU bug report logs - #78599
[PATCH emacs-team 0/7] Last patches for emacs-team

Previous Next

Full log

Message #23 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 6/7] gnu: emacs-origami: Fix invalid-face-box.
Date: Tue, 27 May 2025 01:05:22 +0200

This fixes face errors in the emacs-keystore-mode dependent package on
emacs <at> 30.

* gnu/packages/emacs-xyz.scm (emacs-origami)[source]<snippet>: Adapt
to emacs <at> 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(-)

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")
-- 
2.49.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.