From patchwork Sat Feb 5 10:27:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Niklas Eklund X-Patchwork-Id: 37009 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 48C7D27BBEA; Sat, 5 Feb 2022 10:28:17 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 C113127BBE9 for ; Sat, 5 Feb 2022 10:28:16 +0000 (GMT) Received: from localhost ([::1]:50110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGIIh-0006zZ-VF for patchwork@mira.cbaines.net; Sat, 05 Feb 2022 05:28:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGIIZ-0006zP-5C for guix-patches@gnu.org; Sat, 05 Feb 2022 05:28:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGIIU-0002uA-4T for guix-patches@gnu.org; Sat, 05 Feb 2022 05:28:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGIIU-0001WO-2B for guix-patches@gnu.org; Sat, 05 Feb 2022 05:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53796] [PATCH] gnu: Update emacs-bash-completion Resent-From: Niklas Eklund Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Feb 2022 10:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53796 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53796@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16440568625817 (code B ref -1); Sat, 05 Feb 2022 10:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Feb 2022 10:27:42 +0000 Received: from localhost ([127.0.0.1]:33805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGII9-0001Vl-SG for submit@debbugs.gnu.org; Sat, 05 Feb 2022 05:27:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:52212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGII8-0001Ve-No for submit@debbugs.gnu.org; Sat, 05 Feb 2022 05:27:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGII8-0006xt-HM for guix-patches@gnu.org; Sat, 05 Feb 2022 05:27:40 -0500 Received: from mout02.posteo.de ([185.67.36.66]:40401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGII5-0002sf-KE for guix-patches@gnu.org; Sat, 05 Feb 2022 05:27:40 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A43D5240103 for ; Sat, 5 Feb 2022 11:27:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1644056854; bh=WUurK59U5NaT3YyyRRgn3g3S/c9hAgoM+kwl6nW1nvM=; h=From:To:Subject:Date:From; b=NyvDe6EqeAmQOtLeXqYGLQCOtfUXCyZaiORBGP4+cjXYyItmdXRjDeDLs46HcIEuX 26+ImmVWqqTMjvj7wMZyNYUBzbOAs3q33J6OR/KusqlcuLYXgDdQLBWsuYL+TAiYYK Bgwx5LVuEijl3DxApXPleQTsxu4OS+C1JqZveXAAfTKJp4RrXpvxxbLE7CoepYwuYN Oh3l74Iwm5ZMcAfZdEYMWZc4Ayv0acpxZ3u3GtkqnieITrBXK3z1zlMxlUD3RbUdMT JgrixcnOOpWXqMP//90C6uemIhTcDovcQGXdPBZxBVfKpPZDz5r+zy/XzOhtoAqPaO 2eus34jxgC0Xg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JrT9x74Njz6tmd for ; Sat, 5 Feb 2022 11:27:33 +0100 (CET) From: Niklas Eklund Date: Sat, 05 Feb 2022 10:27:33 +0000 Message-ID: <87v8xt38x6.fsf@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=niklas.eklund@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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-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" X-getmail-retrieved-from-mailbox: Patches Hi, this patch updates the emacs-bash-completion package to the most recent commit on git. This update is required in order for it to work with completion frameworks that modifies the list of candidates. Such as the combination of corfu+orderless. /Niklas From 10a95cb0fa836ac37a3426f0964edd7784a1c0ca Mon Sep 17 00:00:00 2001 From: Niklas Eklund Date: Sat, 5 Feb 2022 11:21:00 +0100 Subject: [PATCH] gnu: emacs-bash-completion: Update to 3.1.0-0.c5eaeed. * gnu/packages/emacs-xyz.scm (emacs-bash-completion): Update to 3.1.0-0.c5eaeed. --- gnu/packages/emacs-xyz.scm | 72 ++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 681e0e2fc7..99fb53434d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15908,41 +15908,45 @@ (define-public emacs-helm-slack Slack client.") (license license:gpl3+)))) - (define-public emacs-bash-completion - (package - (name "emacs-bash-completion") - (version "3.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/szermatt/emacs-bash-completion") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4")))) - (inputs (list bash)) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (λ _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-before 'install 'configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash"))) - (emacs-substitute-variables "bash-completion.el" - ("bash-completion-prog" (string-append bash "/bin/bash")))) - #t))))) - (home-page "https://github.com/szermatt/emacs-bash-completion") - (synopsis "Bash completion for the shell buffer") - (description - "@code{bash-completion} defines dynamic completion hooks for shell-mode -and shell-command prompts that are based on Bash completion.") - (license license:gpl2+))) + ;; Need to use a newer commit than the latest version in order to support + ;; completion interfaces that alters the candidate list provided by the + ;; package + (let ((commit "c5eaeed156ab906190c662d491269230967104b1") + (revision "0")) + (package + (name "emacs-bash-completion") + (version (git-version "3.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/szermatt/emacs-bash-completion") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r221iirqsbz13s76r68i496izbirrvcw8ql3wsh205zmxa3jqg1")))) + (inputs (list bash)) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (λ _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-before 'install 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (emacs-substitute-variables "bash-completion.el" + ("bash-completion-prog" (string-append bash "/bin/bash")))) + #t))))) + (home-page "https://github.com/szermatt/emacs-bash-completion") + (synopsis "Bash completion for the shell buffer") + (description + "@code{bash-completion} defines dynamic completion hooks for shell-mode + and shell-command prompts that are based on Bash completion.") + (license license:gpl2+)))) (define-public emacs-easy-kill (package -- 2.34.0