GNU bug report logs - #78584
[PATCH emacs-team 0/2] emacs-origami dependent packages fix.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 78584 in the body.
You can then email your comments to 78584 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH emacs-team 0/2] emacs-origami dependent packages fix.
Date: Sun, 25 May 2025 09:30:43 +0200

This fixes an issue with emacs-origami on emacs <at> 30.

Nicolas Graves (2):
  gnu: emacs-origami: Fix invalid-face-box.
  gnu: emacs-keystore-mode: Improve style and enable tests.

 gnu/packages/emacs-xyz.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

-- 
2.49.0

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78584 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 1/2] gnu: emacs-origami: Fix invalid-face-box.
Date: Sun, 25 May 2025 09:40:52 +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 e2f106794c..0a6600282f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35827,7 +35827,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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78584 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 2/2] gnu: emacs-keystore-mode: Improve style and enable tests.
Date: Sun, 25 May 2025 09:40:53 +0200

* gnu/packages/emacs-xyz.scm (emacs-keystore-mode)[arguments]: Improve
style and enable tests.
---
 gnu/packages/emacs-xyz.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0a6600282f..5164678208 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -42393,10 +42393,9 @@ (define-public emacs-keystore-mode
           (base32 "06cznkqkm04zz5lqfb514aqvsr2p13arzysixv0ss0bqpvdq7cv7"))))
       (build-system emacs-build-system)
       (arguments
-       `(#:tests? #f                    ; XXX: "invalid face box"
-         #:test-command
-         '("emacs" "--no-init-file" "--batch"
-           "--eval=(require 'ecukes)" "--eval=(ecukes)")))
+       (list #:test-command
+             #~(list "emacs" "--no-init-file" "--batch"
+                     "--eval=(require 'ecukes)" "--eval=(ecukes)")))
       (native-inputs
        (list emacs-ecukes emacs-espuds emacs-undercover openjdk9))
       (propagated-inputs
-- 
2.49.0

Message #16 received at 78584-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 78584-done <at> debbugs.gnu.org
Subject: Re: [bug#78584] [PATCH emacs-team 0/2] emacs-origami dependent
 packages fix.
Date: Mon, 26 May 2025 21:59:20 +0900

Hi,

Nicolas Graves <ngraves <at> ngraves.fr> writes:

> This fixes an issue with emacs-origami on emacs <at> 30.
>
> Nicolas Graves (2):
>   gnu: emacs-origami: Fix invalid-face-box.
>   gnu: emacs-keystore-mode: Improve style and enable tests.

Applied, thank you!

-- 
Thanks,
Maxim

Previous Next

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