GNU bug report logs - #78315
[PATCH emacs-team 00/53] More fixes, and a lot of style improvements.

Previous Next

Full log

View this message in rfc822 format

From: Ian Eure <ian <at> retrospec.tv>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 78315 <at> debbugs.gnu.org
Subject: [bug#78315] [PATCH 43/53] gnu: emacs-origami: Improve style.
Date: Sat, 17 May 2025 09:24:34 -0700

Hi Nicolas,

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

> * gnu/packages/emacs-xyz.scm (emacs-origami): Run guix style.
>   [source]: Use a <snippet> instead of an obscure patch to 
>   replace cl.
> ---
>  gnu/packages/emacs-xyz.scm | 28 +++++++++++-----------------
>  1 file changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm 
> b/gnu/packages/emacs-xyz.scm
> index 38f6481897..38c1f07b75 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -35819,8 +35819,7 @@ (define-public emacs-rjsx-mode
>  (define-public emacs-origami
>    (let ((commit "1f38085c8f9af7842765ed63f7d6dfe4dab59366")
>          (version "1.0")
> -        (revision "1")
> -        (patch "1d9c4f120c027a5009b0424270e3aae59f1cb128"))
> +        (revision "1"))
>      (package
>        (name "emacs-origami")
>        (version (git-version version revision commit))
> @@ -35832,24 +35831,19 @@ (define-public emacs-origami
>                 (commit commit)))
>           (file-name (git-file-name name version))
>           (sha256
> -          (base32
> - 
> "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"))
> -         (patches
> -          (list
> -           (origin
> -             (method url-fetch)
> -             (uri (string-append
> -                   "https://github.com/gregsexton/origami.el"
> -                   "/commit/" patch ".patch"))
> -             (sha256
> -              (base32
> - 
> "0yia4dhqjzdidxd77s2ggg6mmj05jbsnwc35myzzhzh1zbq8mrfy")))))))
> +          (base32 
> "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"))
> +         (modules '((guix build utils)))
> +         (snippet #~(substitute* (find-files "." "\\.el$")
> +                      (("\\(require 'cl\\)")
> +                       "(require 'cl-lib)")
> +                      (("(destructuring-bind|remove-if)" all)
> +                       (string-append "cl-" all))))))

Does `emacs-substitute-sexps' work here?

 -- Ian

Previous Next

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