From patchwork Sat Mar 15 11:53:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 40195 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C551927BBEA; Sat, 15 Mar 2025 11:54:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E856527BBE2 for ; Sat, 15 Mar 2025 11:54:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttQ5d-0008UH-QR; Sat, 15 Mar 2025 07:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttQ5c-0008Tk-Bq for guix-patches@gnu.org; Sat, 15 Mar 2025 07:54:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttQ5a-0003aJ-Tw; Sat, 15 Mar 2025 07:54:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=pkoQnwcAXaGB+zJCcUM9vqIDoLvXF7Xu1C87XM0miCU=; b=S8bfR1lwJrGIPN+xhXr9L8ufrKsedF9YdAfxrmPZKd7cdAgswRLYJ6p+KLwKYrnSomxLTCIShMAAkrJ1WNXbwrFZ81J2Cdij1xV8zrvqZrx/3K8AvHTAMJsY26GJhY0zQVQ07GZxdtLnIorB8eri0mfLdANs6UcwCNE8qf0AvXgjcVWQ9xBV9LH49nAD6KHlejzEF0SuixJC/7rbFzcVBfJGsYUc94tNbqg0R0Ykao/kesV5D3tYQByC2bYD73xRNKU/GeHJkWQJkPfo9UMN1BYrjhIqunJHHVX9fZw+jIuaiS2rWDRts1jjtljyIooTgMs3bcPLEbiczaqmO8CnyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttQ5a-0007dS-42; Sat, 15 Mar 2025 07:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77031] [PATCH 1/2] gnu: guile-for-guile-emacs: Update to e62c0d1b32f625fcbaa733c32a88622846aee905. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, janneke@gnu.org, ludo@gnu.org, z572@z572.online, guix-patches@gnu.org Resent-Date: Sat, 15 Mar 2025 11:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77031 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77031@debbugs.gnu.org Cc: 71989@debbugs.gnu.org, Andreas Enge , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Zheng Junjie X-Debbugs-Original-Xcc: Andreas Enge , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Zheng Junjie Received: via spool by 77031-submit@debbugs.gnu.org id=B77031.174203963929335 (code B ref 77031); Sat, 15 Mar 2025 11:54:02 +0000 Received: (at 77031) by debbugs.gnu.org; 15 Mar 2025 11:53:59 +0000 Received: from localhost ([127.0.0.1]:39327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttQ5R-0007cm-7Z for submit@debbugs.gnu.org; Sat, 15 Mar 2025 07:53:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52818) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ttQ5N-0007cF-RC; Sat, 15 Mar 2025 07:53:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttQ5I-0003Yl-HM; Sat, 15 Mar 2025 07:53:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=pkoQnwcAXaGB+zJCcUM9vqIDoLvXF7Xu1C87XM0miCU=; b=qjZ7VohicbPB7QzMXKdy XTZVtf5gjAaiZt347l3NJh2mTD1O3HgbT8AyNpj21zTcl0FTjfZsvekMZQfQwHIr/eQ/3UijQDuWj CfTgFLtdy/l/8BN2+Zo3n4bkCdnod4dq0Z67S8pRoXSGYVrIzpKhIVrCa3bc0eF4nrUvU4euG3+l6 rid6191+ZgCHc/ZJt5K1Zhxky5HMyMAMfOQU7GLahSotbTPSjMs6E6GOH2nggW/9wUS5GXSTzEABh RYhvQcwwzOLVziIKql8fez6K2Nwg710xKTFqUvyH0WR9NV5Mhb5pyfI8qCvmSu/cWFb2uPktUu2a2 Xr3RRGnCFQ2qqA==; From: Janneke Nieuwenhuizen Date: Sat, 15 Mar 2025 12:53:36 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile.scm (guile-for-guile-emacs): Update to e62c0d1b32f625fcbaa733c32a88622846aee905, from https://codeberg.org/lyrra/guile. Change-Id: Ic1a48865bfd9ee1201671b1f4b5e3659c084d71f --- gnu/packages/guile.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 7e1f9a7c1c6..0e600fbc092 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christine Lemmer-Webber -;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2023, 2024, 2025 Janneke Nieuwenhuizen ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Andy Wingo @@ -612,20 +612,20 @@ (define package-for-guile-2.2 #:deep? #f)) (define-public guile-for-guile-emacs - (let ((commit "4b9b8277733729f5b825f78fadfead9fc3630e7e") - (revision "0")) + (let ((commit "e62c0d1b32f625fcbaa733c32a88622846aee905") + (revision "2")) (package (inherit guile-next) (name "guile-for-guile-emacs") (version (git-version "3.0.7-81" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "git://git.savannah.gnu.org/guile.git") + (url "https://codeberg.org/lyrra/guile") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0fgkcv29581kqkxqq6y48xly72970qs7016qhs6c4ilygg0gyfqb")))) + "0xfnd99iws9dwk5va8bmqpysmb8pnb1w91rw7rbfzzklyfvpibh6")))) (arguments (substitute-keyword-arguments (package-arguments guile-next) ((#:phases phases '%standard-phases) From patchwork Sat Mar 15 11:53:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 40196 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3959527BBEA; Sat, 15 Mar 2025 11:56:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4589327BBE2 for ; Sat, 15 Mar 2025 11:56:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttQ7A-0000Ou-CZ; Sat, 15 Mar 2025 07:55:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttQ6b-0000C7-1r for guix-patches@gnu.org; Sat, 15 Mar 2025 07:55:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttQ6a-0003po-03 for guix-patches@gnu.org; Sat, 15 Mar 2025 07:55:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=hlbyyQASzP4kBdiz+3Yf1SJotvtSUsj5uhaUSHz8I24=; b=EZ0PTWZvGKMSM54hWf7vgXZDYmx1J3ILPaLqt8HPQFtcTn1Lx6bNbKlO62M60rtTASljG3pDmI92wKsD+ROpUT0E3BcCiURKyMlAJdVffqv8RcONmQvZrn0Rg12P+EUCY5D5Q61ckadxh33fR5Na/FtAZO/op9nc30ny8KTUtSydBbo59iujQyUdHr+u3mfy7zjgJT7Lms3MA0zOo6HKFHF0G1Yf9Ad3mQdZPZPrFCU0kWNT8qzLfJlHtaMW4n9lM2za0QuD5cc2xcaf6A/GYpMnRdEDMomzT9ht0Bq010YKbsqtgzdoFrZ3QwJn+zfngU2GemWU1jyO54i8RN8Nhg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttQ6Z-0007iS-P1; Sat, 15 Mar 2025 07:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77031] [PATCH 2/2] gnu: guile-emacs: Update to f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 15 Mar 2025 11:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77031 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77031@debbugs.gnu.org Cc: 71989@debbugs.gnu.org, Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 77031-submit@debbugs.gnu.org id=B77031.174203964829412 (code B ref 77031); Sat, 15 Mar 2025 11:55:03 +0000 Received: (at 77031) by debbugs.gnu.org; 15 Mar 2025 11:54:08 +0000 Received: from localhost ([127.0.0.1]:39336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttQ5b-0007dr-EC for submit@debbugs.gnu.org; Sat, 15 Mar 2025 07:54:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52822) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ttQ5Q-0007cS-03; Sat, 15 Mar 2025 07:53:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttQ5K-0003ZP-LL; Sat, 15 Mar 2025 07:53:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=hlbyyQASzP4kBdiz+3Yf1SJotvtSUsj5uhaUSHz8I24=; b=S6FkNtwI+80w+M63Hane zC3juxfZxLAAQn2I1fLhsL2MQtthG8sCTZEIqC5ZSPFGiC2FB0Ygek3AGkT2BDp1paIYzAwI+ZJqF uQUd9+5UM6U1GebEW6ClE3eNm0IAfJ2ohZrHxaw+DzFH0Ph5oCpQwP/8qGNW5cCH52hFD89hvdyEw VDFiJzuJPBoI/1lX+3XNbkyEU2H80BzS8pLVwc0TU8E8MBdNRUMTxEaAJBB+Zm7Xh4667/1nSxa5O qUq/o3b6R0vx1r7jtxGmgg6etF9W+VEhJwRktxWClIpGRHK8r3fGyWqHo9LnfZHttj6v0DzeSufJ8 k03MBpj6qnPgKQ==; From: Janneke Nieuwenhuizen Date: Sat, 15 Mar 2025 12:53:37 +0100 Message-ID: <845cdfd61bbf22a7cb18708e1a0bb63e138dd832.1742039049.git.janneke@gnu.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/guile-emacs-build-fixes.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/emacs.scm (guile-emacs): Update to f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa. [inputs]: Add imagemagick. [synopsis, description]: Update. [arguments]: Add --with-imagemagick. Remove #:tests? #f (upstream has disabled the test suite). Change-Id: I585e8884635c02f5df38d9418f04ac0ae750303d --- gnu/local.mk | 1 - gnu/packages/emacs.scm | 25 +++-- .../patches/guile-emacs-build-fixes.patch | 100 ------------------ 3 files changed, 17 insertions(+), 109 deletions(-) delete mode 100644 gnu/packages/patches/guile-emacs-build-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index d0388126900..4cb60ade0ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1559,7 +1559,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-lzlib-hurd64.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ - %D%/packages/patches/guile-emacs-build-fixes.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ %D%/packages/patches/gtk2-harden-list-store.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c5e671c6a98..fb72b275444 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ricardo Wurmus -;;; Copyright © 2017, 2023, 2024 Janneke Nieuwenhuizen +;;; Copyright © 2017, 2023, 2024, 2025 Janneke Nieuwenhuizen ;;; Copyright © 2018, 2023 Efraim Flashner ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice @@ -69,6 +69,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages lesstif) ; motif #:use-module (gnu packages linux) ; alsa-lib, gpm #:use-module (gnu packages mail) ; for mailutils @@ -639,8 +640,8 @@ (define-public emacs-next-tree-sitter (define-public guile-emacs (let ((upstream-version "31.0.50") - (commit "8f87cbc1dae6a9e77368afc5736df8c342e9153d") - (revision "0")) + (commit "f2d0459d6a4cda8b7c38b6fb12a55f1330ba50fa") + (revision "2")) (package (inherit emacs) (name "guile-emacs") @@ -651,18 +652,25 @@ (define-public guile-emacs (url "https://codeberg.org/lyrra/guilemacs") (commit commit))) (file-name (git-file-name name version)) - (patches (search-patches "guile-emacs-build-fixes.patch")) (sha256 (base32 - "1yhxy6d5i673y35i66d2x975zih3cw6p59ylsb8xk68wds6s7xrl")))) + "0ry0dn9xrndpz54hs92dnnsw4xa4qn4lz898ldlh2rs47ah1f4wl")))) (native-inputs (modify-inputs (package-native-inputs emacs) (prepend autoconf automake guile-for-guile-emacs))) + (inputs + (modify-inputs (package-inputs emacs) + (prepend imagemagick))) (home-page "https://guile-emacs.org") + (synopsis "Emacs text editor powered by Guile('s elisp implementation)") + (description + "Guile-Emacs brings Emacs and Guile together by providing a new Elisp +implementation based on Guile's compiler technology, serving as the basis for +a more expressive and extensible version of Elisp. + +Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.") (arguments - (substitute-keyword-arguments `(;; Tests aren't passing for now. - #:tests? #f - #:strip-binaries? #f + (substitute-keyword-arguments `(#:strip-binaries? #f ,@(package-arguments emacs)) ((#:configure-flags flags ''()) #~`("CFLAGS=-Og -ggdb3" @@ -672,6 +680,7 @@ (define-public guile-emacs "--with-jpeg=no" "--without-cairo" "--without-tree-sitter" + "--with-imagemagick" ,@(fold delete #$flags '("--with-cairo" "--with-modules" "--with-native-compilation=aot")))) diff --git a/gnu/packages/patches/guile-emacs-build-fixes.patch b/gnu/packages/patches/guile-emacs-build-fixes.patch deleted file mode 100644 index 3fb173b4900..00000000000 --- a/gnu/packages/patches/guile-emacs-build-fixes.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 49e8725b66cb721931a9a5f0f35405e19ccee956 Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen -Date: Sat, 7 Dec 2024 20:52:04 +0100 -Subject: [PATCH 1/3] robin's patch. - ---- - src/gtkutil.c | 4 ++-- - src/print.c | 5 ++--- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/gtkutil.c b/src/gtkutil.c -index b1471d56eb9..be72b50c9ef 100644 ---- a/src/gtkutil.c -+++ b/src/gtkutil.c -@@ -241,13 +241,13 @@ xg_display_open (char *display_name, GdkDisplay **dpy) - { - GdkDisplay *gdpy; - -- unrequest_sigio (); /* See comment in x_display_ok, xterm.c. */ -+ // unrequest_sigio (); /* See comment in x_display_ok, xterm.c. */ - #ifndef HAVE_PGTK - gdpy = gdk_display_open (display_name); - #else - gdpy = gdk_display_open (strlen (display_name) == 0 ? NULL : display_name); - #endif -- request_sigio (); -+ // request_sigio (); - if (!gdpy_def && gdpy) - { - gdpy_def = gdpy; -diff --git a/src/print.c b/src/print.c -index 002274bd7da..e2c2251bf5c 100644 ---- a/src/print.c -+++ b/src/print.c -@@ -2532,9 +2532,8 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) - else - scm_write (obj, port); - scm_display (SCM_MAKE_CHAR ('>'), port); -- //guilemacs: this looks wrong (size_byte = -1) -- //strout (scm_to_locale_string (scm_get_output_string (port)), -- // -1, -1, printcharfun); -+ char* str = scm_to_locale_string (scm_get_output_string (port)); -+ strout (str, strlen(str), strlen(str), printcharfun); - scm_close_port (port); - } - break; --- -2.46.0 - -From 325fc39906198c33d78e33895e385916099a283f Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen -Date: Sat, 7 Dec 2024 19:00:45 +0100 -Subject: [PATCH 2/3] src/xfns.c: Link fix. - ---- - src/xfns.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/xfns.c b/src/xfns.c -index 858402613b4..94fde4b9e84 100644 ---- a/src/xfns.c -+++ b/src/xfns.c -@@ -8921,7 +8921,8 @@ x_hide_tip (bool delete) - else - tip_frame = Qnil; - -- return unbind_to (count, was_open); -+ dynwind_end (); -+ return was_open; - } - #else /* not USE_GTK */ - if (NILP (tip_frame) --- -2.46.0 - -From 7754d875df5c9cb8fefa44604061479108429bce Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen -Date: Sat, 7 Dec 2024 20:14:17 +0100 -Subject: [PATCH 3/3] dump fix: comment use of cl-function-documentation. - ---- - lisp/simple.el | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lisp/simple.el b/lisp/simple.el -index 15c790226b5..d1ceded84ae 100644 ---- a/lisp/simple.el -+++ b/lisp/simple.el -@@ -2800,7 +2800,7 @@ command-completion--command-for-this-buffer-function - '(cl-defmethod function-documentation ((function accessor)) - (oclosure--accessor-docstring function)) ;; FIXME: η-reduce! - --(cl-defmethod function-documentation ((f cconv--interactive-helper)) -+'(cl-defmethod function-documentation ((f cconv--interactive-helper)) - (function-documentation (cconv--interactive-helper--fun f))) - - ;; This should be in `oclosure.el' but that file is loaded before `cl-generic'. --- -2.46.0 -