From debbugs-submit-bounces@debbugs.gnu.org Sun May 15 14:26:03 2022 Received: (at submit) by debbugs.gnu.org; 15 May 2022 18:26:03 +0000 Received: from localhost ([127.0.0.1]:50588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqIwA-0006Bo-5R for submit@debbugs.gnu.org; Sun, 15 May 2022 14:26:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:48796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqIw8-0006Bh-OZ for submit@debbugs.gnu.org; Sun, 15 May 2022 14:25:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqIw8-0008B4-JY for guix-patches@gnu.org; Sun, 15 May 2022 14:25:48 -0400 Received: from out2.migadu.com ([188.165.223.204]:12078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqIw5-0006l3-MR for guix-patches@gnu.org; Sun, 15 May 2022 14:25:48 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1652639141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kN+Yfsjjj1L/VPDnTqB3vokm+fUO9TjydEI8OJ1H/8w=; b=x/kGW92Daa4D6oWw+yz25kQh9d8nN1bMT8uQd1YqkSwmZnC/1QHLdpRLKMGtNY6hPuHQko 5Cig0yZR009FV0AmFXYLLKwk32MuENeI6uKZ6WnaiDimdIubBr7HW99Is4cuGsPlGPN4g4 +Di+Wy1JDVmBda3iiHiRuPqERIWQm5jTF5aUmlQj0dzQjl7rFuuQfAJt0fgZYJf/1iamMu AlST3pSZXWV8ozQ6ex3Ka2P6aOWE+kjCS+wnCEbnXtppfmnRawdh4ayC1F/e4RS/YCFWsq WePh89Mbk1whTM3S3ptKtvOHWpJSCR9F+sg7f6IwrHKFohd0Da8eYdAqRZzBEg== From: Kyle Meyer To: guix-patches@gnu.org Subject: [PATCH] gnu: emacs-lispy: Fix failing test under Emacs 28. Date: Sun, 15 May 2022 14:25:37 -0400 Message-Id: <20220515182537.142078-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyleam.com Received-SPF: pass client-ip=188.165.223.204; envelope-from=kyle@kyleam.com; helo=out2.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/patches/emacs-lispy-fix-thread-last-test.patch: New file. * gnu/packages/emacs-xyz.scm (emacs-lispy): Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- Note that successfully building this package depends on the emacs-buttercup update that Michael Rohleder submitted at . gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 4 +- .../emacs-lispy-fix-thread-last-test.patch | 39 +++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-lispy-fix-thread-last-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index cfb499915a..864b32b6c6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1034,6 +1034,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ + %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8a319fc0ff..f2e59ae6c7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020, 2022 Mathieu Othacehe ;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu -;;; Copyright © 2017, 2018 Kyle Meyer +;;; Copyright © 2017, 2018, 2022 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 George Clemmer ;;; Copyright © 2017, 2018 Feng Shu @@ -9708,6 +9708,8 @@ (define-public emacs-lispy (sha256 (base32 "1q3sgk8ffwajmh8l7c4p4fz36xw4fqds8yqblbi5kardaa8bs8cs")) + (patches + (search-patches "emacs-lispy-fix-thread-last-test.patch")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs diff --git a/gnu/packages/patches/emacs-lispy-fix-thread-last-test.patch b/gnu/packages/patches/emacs-lispy-fix-thread-last-test.patch new file mode 100644 index 0000000000..2690dabdc8 --- /dev/null +++ b/gnu/packages/patches/emacs-lispy-fix-thread-last-test.patch @@ -0,0 +1,39 @@ +From dbe23aec174001c42f6edc7a594863a82a24bcfa Mon Sep 17 00:00:00 2001 +From: Kyle Meyer +Date: Sun, 15 May 2022 13:56:37 -0400 +Subject: [PATCH] lispy-test.el (lispy-toggle-threaded-last): Update for Emacs + 28 + +Starting with Emacs 28.1, thread-first uses `(declare (indent 0) ...)` +rather than `(declare (indent 1) ...)`. +--- + + Proposed upstream at . + + lispy-test.el | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/lispy-test.el b/lispy-test.el +index d946731..87d8c87 100644 +--- a/lispy-test.el ++++ b/lispy-test.el +@@ -150,7 +150,13 @@ (ert-deftest lispy-toggle-threaded-last () + "|(thread-last (a 1) (b 2) (c 3))")) + (should (string= (lispy-with "|(equal 1443070800.0\n (ts-unix\n (ts-parse-org-element\n (org-element-context))))" + (lispy-toggle-thread-last)) +- "|(thread-last (org-element-context)\n (ts-parse-org-element)\n (ts-unix)\n (equal 1443070800.0))")) ++ (let ((indent (make-string ++ (if (version< emacs-version "28.1") 2 13) ++ ?\s))) ++ (concat "|(thread-last (org-element-context)\n" ++ indent "(ts-parse-org-element)\n" ++ indent "(ts-unix)\n" ++ indent "(equal 1443070800.0))")))) + (should (string= (lispy-with "|(thread-last (org-element-context)\n (ts-parse-org-element)\n (ts-unix)\n (equal 1443070800.0))" + (lispy-toggle-thread-last)) + "|(equal 1443070800.0\n (ts-unix\n (ts-parse-org-element\n (org-element-context))))"))) + +base-commit: df1b7e614fb0f73646755343e8892ddda310f427 +-- +2.36.0 + base-commit: ebb43029506d994bee0c2b890881fd61a0b0c202 -- 2.36.0