guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 70aa2b6998693fe03d89c09cc9e7345856ad80b8
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Sun Jun 15 20:55:40 2025 +0900
gnu: emacs-gnus-alias: Update to 1.7.0-0.cf1783a.
* gnu/packages/emacs-xyz.scm (emacs-gnus-alias): Update to 1.7.0-0.cf1783a.
[source]: Apply patch.
[home-page]: Update URL.
[description]: Refine description and fix typos.
* gnu/local.mk (dist_patch_DATA): Register patch.
Change-Id: I92f48adfdc7f04e9559ddfda75333c0ac6af179e
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/emacs-xyz.scm | 49 ++++++++++++----------
.../emacs-gnus-alias-reference-signature.patch | 27 ++++++++++++
3 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index b2d54ba8ae..c569c327a9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1230,6 +1230,7 @@ dist_patch_DATA =
\
%D%/packages/patches/emacs-eglot-x-fix-apply-text-edits.patch
\
%D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
+ %D%/packages/patches/emacs-gnus-alias-reference-signature.patch \
%D%/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch
\
%D%/packages/patches/emacs-gnus-desktop-notify-rescan.patch \
%D%/packages/patches/emacs-helpful-fix-signature.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 05eaa5ebbd..9935c6cebc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -37707,34 +37707,39 @@ An optional mode-line format can be enabled with
@code{zerodark-setup-modeline-f
(license license:gpl3+)))
(define-public emacs-gnus-alias
- (package
- (name "emacs-gnus-alias")
- (version "20150316")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/hexmode/gnus-alias";)
- (commit "9447d3ccb4c0e75d0468899cccff7aa249657bac")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4"))))
- (build-system emacs-build-system)
- (home-page "https://melpa.org/#/gnus-alias";)
- (synopsis "Alternative to @code{gnus-posting-styles}")
- (description "This Emacs add-on provides a simple mechanism to switch
-Identities when using a @code{message-mode} or a @code{message-mode} derived
-mode. Identities can include @code{From} and @code{Organisation} headers,
+ ;; There are no release no tag. Use the latest commit.
+ (let ((commit "cf1783a9294bc2f72bfafcaea288c159c4e3dee5")
+ (revision "0"))
+ (package
+ (name "emacs-gnus-alias")
+ ;; The version string is specified in gnus-alias.el.
+ (version (git-version "1.7.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/hexmode/gnus-alias";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0cs0cyi7hj7ga9aiqz4dafc07xrk3l5g9zzlbda9l90xbvyfssa0"))
+ (patches
+ (search-patches
"emacs-gnus-alias-reference-signature.patch"))))
+ (build-system emacs-build-system)
+ (home-page "https://github.com/hexmode/gnus-alias";)
+ (synopsis "Alternative to @code{gnus-posting-styles}")
+ (description "Gnus-alias provides a simple mechanism to switch
+identities when using a @code{message-mode} or a @code{message-mode} derived
+mode. Identities can include @code{From} and @code{Organization} headers,
extra headers, body and signature. Other features include:
-
@itemize
-@item Switch Identities in a message buffer.
-@item Access original message to help determine Identity of the followup/reply
+@item Switch identities in a message buffer.
+@item Access original message to help determine identity of the followup/reply
message.
@item Act on a forwarded message as if it were a message being replied to.
@item Start a new message with a given Identity pre-selected.
@end itemize")
- (license license:gpl2+)))
+ (license license:gpl2+))))
(define-public emacs-gnus-desktop-notify
(package
diff --git a/gnu/packages/patches/emacs-gnus-alias-reference-signature.patch
b/gnu/packages/patches/emacs-gnus-alias-reference-signature.patch
new file mode 100644
index 0000000000..70885434bd
--- /dev/null
+++ b/gnu/packages/patches/emacs-gnus-alias-reference-signature.patch
@@ -0,0 +1,27 @@
+Upstream-status: https://github.com/hexmode/gnus-alias/pull/7
+
+diff --git a/gnus-alias.el b/gnus-alias.el
+index 944d6db..c27d3d1 100644
+--- a/gnus-alias.el
++++ b/gnus-alias.el
+@@ -1134,11 +1134,15 @@ above circumstances rather then generate an error."
+ (gnus-alias-remove-sig)
+
+ ;; add signature maybe
+- (when sig
+- (goto-char (point-max))
+- (unless (bolp) (insert "\n"))
+- (insert "-- \n")
+- (insert (gnus-alias-get-value sig))))
++ (let ((reference-sig (and reference
++ (gnus-alias-get-sig
++ (assoc-string (gnus-alias-get-value
reference)
++ gnus-alias-identity-alist
t)))))
++ (when (or sig reference-sig)
++ (goto-char (point-max))
++ (unless (bolp) (insert "\n"))
++ (insert "-- \n")
++ (insert (gnus-alias-get-value (or sig reference-sig))))))
+
+ ;; remember last Identity used
+ (setq gnus-alias-current-identity identity)))
