From patchwork Fri Aug 18 23:05:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 53012 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 6CE8727BBE9; Sat, 19 Aug 2023 09:44:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 A7C7A27BBE2 for ; Sat, 19 Aug 2023 09:44:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXHYx-0000c3-Gd; Sat, 19 Aug 2023 04:44:03 -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 1qXHYw-0000bd-6y for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:02 -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 1qXHYv-0000eh-VX for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXHYw-0005Ab-RS; Sat, 19 Aug 2023 04:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65376] [PATCH emacs-team 3/7] gnu: emacs-helpful: Update to 0.21. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 19 Aug 2023 08:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65376 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65376@debbugs.gnu.org Cc: andrew@trop.in, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, liliana.prikler@gmail.com Received: via spool by 65376-submit@debbugs.gnu.org id=B65376.169243459819745 (code B ref 65376); Sat, 19 Aug 2023 08:44:02 +0000 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:18 +0000 Received: from localhost ([127.0.0.1]:49399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYC-00058C-R4 for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:17 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:47279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHY8-00057M-LL for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:13 -0400 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-977e0fbd742so206787366b.2 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434586; x=1693039386; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZF/UGVjC2qG0eH0BzVSt+Js1KJ2yxQT3GhEcC7e3tXw=; b=Wimqz9gdjT6zSMzxEbvcHJVIcxHD4mb58PTiOuhaFlsAB4NgQ24ApEPrx/W1OE4v+E Bz/FpDS3ndR2LusyQKGqXpP8avYeEM16mmExWkVr9Vw3xL8FauNpTrbaPUu5hauLQV8O 5dKjbquLyJWteKb50hnlk7zVM04UAlzggP9wfp6JfxRjOkySgeo08NjY2JKuiXiS9S76 OiuexOcJpSnwMFgyQOsEJjwX/QKsxjjEsGzFIEEvKZ3HAT5vBZAEDN75ebp18fSsu7ek dracqt7O+wI+CEivAqSBAzghed3mrIGiHNmLnE5Cur6dO/0wpOcgUkl6rppoOlOzsosf 4aMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434586; x=1693039386; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZF/UGVjC2qG0eH0BzVSt+Js1KJ2yxQT3GhEcC7e3tXw=; b=MtGI+7QNVmyc8HfEfp42ie+69lhf5M9byBP2RYzA+yLaptNfxO02IbF10krZWDOZD/ YMJabHwtnHgNfdGHd7ooPygJdEM8ZeytlqSZr/xFUd5WHaSxRC8U0h9qwCzqKoVRVJh9 oSizk+CcIe6kWK6S7RN60N8uYUKMFYNsyi2fJoVcco+FG4qal3x0+HEkDNzsl5tIv3sY Kvr/hERX68DaVUiau6bgBziH5XDuaquiGQOdwbTLfdZdX5nVrOB30NFoC2SqLy8iXIQt xf6kJv7dh+NLVhLurZsULZLXKQZhiNcVbgV6PJ3b4VRg45nL48bUoE5eomeMJhr72fAq 4Aiw== X-Gm-Message-State: AOJu0YyVCoW6dAsywy2V1SBMJ9aHlOKTxiOHjiw6QN4PvTeQdzOHDu69 eJZjgAdOEfx/sNrj8qzCWpZf8pTxvFdaQw== X-Google-Smtp-Source: AGHT+IEx8yXJOllr7NIStcIHLQBKCnK70FaAHDv7W3UPUGs3rQpTJzT7Z5J5JeYhEMFZCc9sJ/AMWA== X-Received: by 2002:a17:906:9bdc:b0:99b:bf82:75fc with SMTP id de28-20020a1709069bdc00b0099bbf8275fcmr997239ejc.32.1692434585807; Sat, 19 Aug 2023 01:43:05 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.04 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:05 -0700 (PDT) Message-ID: <1fcf9c0d7de956e7029090bdcc5b921932e95082.1692427560.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 01:05:22 +0200 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/emacs-helpful-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.21. [source]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 51 +++++++++---------- .../patches/emacs-helpful-fix-tests.patch | 28 ++++++++++ 3 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 gnu/packages/patches/emacs-helpful-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index e14a9adc33..3b087a6d5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1097,6 +1097,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch \ + %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1e03625f62..dbc176e379 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24363,31 +24363,30 @@ (define-public emacs-download-region (license license:gpl3+)))) (define-public emacs-helpful - (let ((commit "1c98f6f06a85def5d34c735f8cd407f20cebddf9") - (revision "1")) - (package - (name "emacs-helpful") - (version (git-version "0.19" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Wilfred/helpful") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "18b5hjfji51zxjrxhkklxx3j9svk295awmxv8n95mp8ilas2kd3l")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-dash emacs-elisp-refs emacs-f emacs-s)) - (native-inputs - (list emacs-ert-runner emacs-undercover)) - (arguments - `(#:tests? #t - #:test-command '("ert-runner"))) - (home-page "https://github.com/Wilfred/helpful") - (synopsis "More contextual information in Emacs help") - (description "@code{helpful} is an alternative to the built-in Emacs help + (package + (name "emacs-helpful") + (version "0.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Wilfred/helpful") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03afgdbs5nmhw833svrqky7fmfs1zlvqzcj7j5g29sakivs60xqc")) + (patches (search-patches "emacs-helpful-fix-tests.patch")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-dash emacs-elisp-refs emacs-f emacs-s)) + (native-inputs + (list emacs-ert-runner emacs-undercover)) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (home-page "https://github.com/Wilfred/helpful") + (synopsis "More contextual information in Emacs help") + (description "@code{helpful} is an alternative to the built-in Emacs help that provides much more contextual information. @itemize @@ -24406,7 +24405,7 @@ (define-public emacs-helpful @item Trace, disassemble functions from inside Helpful. This is discoverable and doesn't require memorisation of commands. @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-logview (package diff --git a/gnu/packages/patches/emacs-helpful-fix-tests.patch b/gnu/packages/patches/emacs-helpful-fix-tests.patch new file mode 100644 index 0000000000..61ed0671a4 --- /dev/null +++ b/gnu/packages/patches/emacs-helpful-fix-tests.patch @@ -0,0 +1,28 @@ +From 233e254bbe44f70ca899a506b3706af489228fda Mon Sep 17 00:00:00 2001 +From: aagon +Date: Thu, 10 Aug 2023 20:03:52 +0200 +Subject: [PATCH] Repair helpful--display-implementations test for emacs 29.1 + +--- + test/helpful-unit-test.el | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el +index 0f5177b..0716b0d 100644 +--- a/test/helpful-unit-test.el ++++ b/test/helpful-unit-test.el +@@ -1089,8 +1089,12 @@ find the source code." + (require 'xref) + (helpful-function 'xref-location-marker) + (should (s-contains-p "Implementations" (buffer-string))) +- (should (s-contains-p "((l xref-file-location))" (buffer-string))) +- (should (s-contains-p "((l xref-buffer-location))" (buffer-string)))) ++ (should (if (version< emacs-version "29.1") ++ (s-contains-p "((l xref-file-location))" (buffer-string)) ++ (s-contains-p "(xref-location-marker (L xref-file-location))" (buffer-string)))) ++ (should (if (version< emacs-version "29.1") ++ (s-contains-p "((l xref-buffer-location))" (buffer-string)) ++ (s-contains-p "(xref-location-marker (L xref-buffer-location))" (buffer-string))))) + + (defun helpful--boring-advice (orig-fn &rest args) + (apply orig-fn args))