From patchwork Sat Jan 7 07:16:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 45900 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 BAD2627BBED; Sat, 7 Jan 2023 07:17:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS 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 46F6727BBE9 for ; Sat, 7 Jan 2023 07:17:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pE3Ry-0005I9-MG; Sat, 07 Jan 2023 02:17:06 -0500 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 1pE3Rv-0005Gr-9N for guix-patches@gnu.org; Sat, 07 Jan 2023 02:17:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pE3Ru-0006yC-Ff for guix-patches@gnu.org; Sat, 07 Jan 2023 02:17:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pE3Ru-000600-8u for guix-patches@gnu.org; Sat, 07 Jan 2023 02:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60549] [PATCH 2/5] gnu: Add emacs-citre. Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Jan 2023 07:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60549 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 60549-done@debbugs.gnu.org Received: via spool by 60549-done@debbugs.gnu.org id=D60549.167307578923011 (code D ref 60549); Sat, 07 Jan 2023 07:17:02 +0000 Received: (at 60549-done) by debbugs.gnu.org; 7 Jan 2023 07:16:29 +0000 Received: from localhost ([127.0.0.1]:56346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pE3RM-0005z3-Vq for submit@debbugs.gnu.org; Sat, 07 Jan 2023 02:16:29 -0500 Received: from m12.mail.163.com ([220.181.12.214]:42832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pE3RJ-0005yK-73 for 60549-done@debbugs.gnu.org; Sat, 07 Jan 2023 02:16:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=4kSbdiiAZnE8SDevzyXhPw2tZaVDxZ5wWpji6gm3gXQ=; b=aGaWgRJSgGFDUyc1wj49gdFtgO9tQSiJ8aGkfTgfF92gs8DmWrRnb+vcgICXhx z3ZBtwVP44/nQE57d3t1DyF2bnfQZZBn19JLfU/4++K7TyqmJx/otkKRxoawO8+i VPJyJwznxWlrDpPgTZZEqrIFL9ErZ1QpHHAr98m1DHTrE= Received: from Guix (unknown [49.88.145.87]) by zwqz-smtp-mta-g4-3 (Coremail) with SMTP id _____wCnR_M2HLljBtJCAA--.25344S2; Sat, 07 Jan 2023 15:16:06 +0800 (CST) From: Feng Shu In-Reply-To: <87v8ljrz64.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Sat, 07 Jan 2023 01:00:51 +0100") References: <20230104124644.19925-1-tumashu@163.com> <87v8ljrz64.fsf@nicolasgoaziou.fr> Date: Sat, 07 Jan 2023 15:16:06 +0800 Message-ID: <87v8lix1ah.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-CM-TRANSID: _____wCnR_M2HLljBtJCAA--.25344S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTE73sFUUUUU X-Originating-IP: [49.88.145.87] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiRRzv1GDuyR+NtgAAsB 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 Nicolas Goaziou writes: Hello: emacs-citre now get the wrong ctags path, for emacs has ctags too. :-) > Hello, > > tumashu@163.com writes: > >> * gnu/packages/emacs-xyz.scm (emacs-citre): New variable. > > Applied, with the changes detailed below. Thank you. > >> + #~(modify-phases %standard-phases >> + (add-after 'unpack 'patch-citre-ctags-program >> + (lambda* (#:key inputs #:allow-other-keys) >> + (emacs-substitute-sexps "citre-ctags.el" >> + ("defcustom citre-ctags-program" >> + (string-append (assoc-ref inputs "universal-ctags") >> + "/bin/ctags"))))) >> + (add-after 'unpack 'patch-citre-readtags-program >> + (lambda* (#:key inputs #:allow-other-keys) >> + (emacs-substitute-sexps "citre-readtags.el" >> + ("defcustom citre-readtags-program" >> + (string-append (assoc-ref inputs "universal-ctags") >> + "/bin/readtags"))))) >> + (add-after 'unpack 'patch-citre-gtags-program >> + (lambda* (#:key inputs #:allow-other-keys) >> + (emacs-substitute-sexps "citre-global.el" >> + ("defcustom citre-gtags-program" >> + (string-append (assoc-ref inputs "global") >> + "/bin/gtags"))))) >> + (add-after 'unpack 'patch-citre-global-program >> + (lambda* (#:key inputs #:allow-other-keys) >> + (emacs-substitute-sexps "citre-global.el" >> + ("defcustom citre-global-program" >> + (string-append (assoc-ref inputs "global") >> + "/bin/global")))))))) > > I merged everything into a single phase and used more specific > `emacs-substitute-variables' instead of `emacs-substitute-sexps'. > >> + (inputs (list global universal-ctags)) >> + (home-page "https://github.com/universal-ctags/citre")> + (synopsis "Ctags IDE on the True Editor") >> + (description >> + "Citre is an advanced Ctags (or actually, readtags) frontend for >> +Emacs. It offers: >> + >> +@itemize >> +@item completion-at-point, xref and imenu integration. >> +@item citre-jump: A completing-read UI for jumping to definition. >> +@item citre-peek: A powerful code reading tool that lets you go down the >> +rabbit hole without leaving current buffer. >> +@end itemize\n") > > I reworded the description. > > Regards, From 9b69ed1524cbe3aa3cb75b44fcb7453b43ee06c2 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Sat, 7 Jan 2023 15:07:14 +0800 Subject: [PATCH] gnu: emacs-cire: Search proper ctags program * gnu/packages/emacs-xyz.scm (emacs-citre) [arguments]<#:phases>: Do not use search-input-file to search ctags, for it will get ctags of emacs-minimal instead of universal-ctags. --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b6024925ec..4e7aa568ea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34170,7 +34170,11 @@ (define-public emacs-citre (lambda* (#:key inputs #:allow-other-keys) (emacs-substitute-variables "citre-ctags.el" ("citre-ctags-program" - (search-input-file inputs "/bin/ctags"))) + ;; NOTE: Do not use search-input-file in this place, for it + ;; will get ctags of emacs-minimal instead of + ;; universal-ctags. + (string-append (assoc-ref inputs "universal-ctags") + "/bin/ctags"))) (emacs-substitute-variables "citre-readtags.el" ("citre-readtags-program" (search-input-file inputs "/bin/readtags"))) -- 2.38.1