guix_mirror_bot pushed a commit to branch emacs-team
in repository guix.
commit 185fa1f08dda67273d1389c99c6ce2e6285545e8
Author: Liam Hupfer <[email protected]>
AuthorDate: Mon Aug 31 22:13:41 2026 -0500
gnu: emacs-eat: Patch aset usage for Emacs 31.
* gnu/packages/patches/emacs-eat-fix-dec-line-drawing.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/emacs-xyz.scm (emacs-eat): Patch aset usage for Emacs 31.
[patches]: Use it here.
Signed-off-by: Liliana Marie Prikler <[email protected]>
Merges: guix/guix#10955
---
gnu/local.mk | 1 +
gnu/packages/emacs-xyz.scm | 4 ++-
.../patches/emacs-eat-fix-dec-line-drawing.patch | 40 ++++++++++++++++++++++
3 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 52093ec2c1..3b99e81748 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1255,6 +1255,7 @@ dist_patch_DATA =
\
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-disable-jit-compilation.patch
\
%D%/packages/patches/emacs-doc-toc-shell-commands.patch \
+ %D%/packages/patches/emacs-eat-fix-dec-line-drawing.patch \
%D%/packages/patches/emacs-elisp-autofmt-fix-region-send.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-gnus-alias-reference-signature.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3c16f352de..a8699f921f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -38052,7 +38052,9 @@ tabulated-lists).")
(snippet
#~(begin
;; Remove generated terminfo database.
- (delete-file-recursively "terminfo")))))
+ (delete-file-recursively "terminfo")))
+ (patches
+ (search-patches "emacs-eat-fix-dec-line-drawing.patch"))))
(build-system emacs-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/emacs-eat-fix-dec-line-drawing.patch
b/gnu/packages/patches/emacs-eat-fix-dec-line-drawing.patch
new file mode 100644
index 0000000000..1aa2d34539
--- /dev/null
+++ b/gnu/packages/patches/emacs-eat-fix-dec-line-drawing.patch
@@ -0,0 +1,40 @@
+From ea22dbf31fa513cec7ada6e0a8f81f15b1a398d0 Mon Sep 17 00:00:00 2001
+Message-ID:
<ea22dbf31fa513cec7ada6e0a8f81f15b1a398d0.1787611092.git.l...@hpfr.net>
+From: Yikai Zhao <[email protected]>
+Date: Sat, 27 Sep 2025 00:52:14 +0800
+Subject: [PATCH] Fix dec-line-drawing
+
+error: Attempt to store non-ASCII char into multibyte string
+
+Upstream-Status: https://codeberg.org/akib/emacs-eat/pulls/240
+---
+ eat.el | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/eat.el b/eat.el
+index d4469cd..8363ca9 100644
+--- a/eat.el
++++ b/eat.el
+@@ -1763,12 +1763,11 @@ character to actually show.")
+ ;; less expensive in terms of bytes needed to
+ ;; transfer than `us-ascii'.
+ ('dec-line-drawing
+- (dotimes (i (length s))
+- (when-let*
+- ((r (gethash
+- (aref s i)
+- eat--t-dec-line-drawing-chars)))
+- (aset s i r)))))
++ ;; remap the string according to dec-line-drawing
charset.
++ (setq s (mapconcat
++ (lambda (c)
++ (char-to-string (gethash c
eat--t-dec-line-drawing-chars c)))
++ s))))
+ ;; Add face.
+ (put-text-property 0 (length s) 'face face s)
+ (put-text-property
+
+base-commit: c8d54d649872bfe7b2b9f49ae5c2addbf12d3b99
+--
+2.54.0
+
