From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: nvp Newsgroups: gmane.emacs.bugs Subject: bug#66673: [PATCH] Fix treesit-install-language-grammar recipe addition Date: Sat, 21 Oct 2023 20:09:21 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000003d03560608456f0e" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9417"; mail-complaints-to="usenet@ciao.gmane.io" To: 66673@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Oct 22 05:10:57 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1quOrh-0002I3-Gt for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 22 Oct 2023 05:10:57 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quOrM-0000WN-0Z; Sat, 21 Oct 2023 23:10:36 -0400 Original-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 1quOrK-0000W7-GU for bug-gnu-emacs@gnu.org; Sat, 21 Oct 2023 23:10:34 -0400 Original-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 1quOrK-00032h-7p for bug-gnu-emacs@gnu.org; Sat, 21 Oct 2023 23:10:34 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quOrl-0004gA-W0 for bug-gnu-emacs@gnu.org; Sat, 21 Oct 2023 23:11:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: nvp Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 22 Oct 2023 03:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66673 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.169794421517914 (code B ref -1); Sun, 22 Oct 2023 03:11:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Oct 2023 03:10:15 +0000 Original-Received: from localhost ([127.0.0.1]:45265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quOr0-0004eq-7D for submit@debbugs.gnu.org; Sat, 21 Oct 2023 23:10:14 -0400 Original-Received: from lists.gnu.org ([2001:470:142::17]:55440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quOqv-0004eY-AK for submit@debbugs.gnu.org; Sat, 21 Oct 2023 23:10:12 -0400 Original-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 1quOqN-0007LA-GH for bug-gnu-emacs@gnu.org; Sat, 21 Oct 2023 23:09:35 -0400 Original-Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quOqL-0002gJ-PT for bug-gnu-emacs@gnu.org; Sat, 21 Oct 2023 23:09:35 -0400 Original-Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-1e59894d105so1546790fac.1 for ; Sat, 21 Oct 2023 20:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697944172; x=1698548972; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Ob4taD5V0o1lE1eD+lsBSCtQCjh9RnxuUb/Rd2V3oP8=; b=JVYk3+NgrCY+JarKzefv6cXdLtBOhTvg2yGKBpHtrXiKkdTk/IE9wQeCftpBrAFXmd boJOLvO2ZSzMaDb0xXyh/KOQOOWVwxWubZdnivMb70+k95hZMWk/bk2eSoL4gebu5/EV oFEbYqRSBGvOmr7SOtOqmKh1hNrxqTwUvh3zbeIkl21ndUxzVmooM/U5Sz1p+ahcJdXX ww86lV4xoENzQJ/208yZQDzsnHbmySam+3vCUwNa/jZgvkBjr6uxCIAeidl+F7o6+q6Y QKja/JaDVUkiZz4NBPsVEIc2zg+yeN4YmClHTdF9riAnD6wlLZkNogV0oT0DmM340I3o OuDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697944172; x=1698548972; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ob4taD5V0o1lE1eD+lsBSCtQCjh9RnxuUb/Rd2V3oP8=; b=RNjnPARUUmXap+geoO+px5rVBiyzzOlYSIeo8Abe+nZ3jM7yVu/KuZWiudfFUGT4Ba vosRditlN+cz5IKnaFNiYtfNjj7IMcMhaMZhs9na5+5I2sCJKyldRH0gCtp+Kfue4yF4 vay4NV6qnsfyVXnipm67JElEzylW8cFKSJjDhqzfGphatFI4kdNQvGo6nEzwZA2JQzmt sZ21S22cLEiTlAocLdAezviNGA1ZacsCimfN9i1W4le0cLAM/1EAiR2oOjocbYhtGSRi 85csiUKo89l8zwN96QYU6wBmOdrUhTiB51DDTyllpjENtDYWM9C4Hw3LX+eR/gZM7+f/ jyWQ== X-Gm-Message-State: AOJu0Yzt8wICrfERCC+Urlj+qODHENXqDrbLxWwbyQHoVOFWrWVB3Uod n4kDNbLjBD4glqTfPMMItzIojth4CGN9qlt/OmG9oswMmd711sUS X-Google-Smtp-Source: AGHT+IEaVlO4ZY97mldtko2wgqHmy+pH83oTzRjidldix1m0s3me1lSMoV1tNoVjBb0I9n1qCQ6dDuMfG+m+WZh6j8w= X-Received: by 2002:a05:6870:a108:b0:1b0:2f63:4ff6 with SMTP id m8-20020a056870a10800b001b02f634ff6mr7324772oae.1.1697944172293; Sat, 21 Oct 2023 20:09:32 -0700 (PDT) Received-SPF: pass client-ip=2001:4860:4864:20::2c; envelope-from=noah.v.peart@gmail.com; helo=mail-oa1-x2c.google.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, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:272947 Archived-At: --0000000000003d03560608456f0e Content-Type: multipart/alternative; boundary="0000000000003d03550608456f0c" --0000000000003d03550608456f0c Content-Type: text/plain; charset="UTF-8" Tags: patch * lisp/treesit.el (treesit-install-language-grammar): fix recipe addition to `treesit-language-source-alist` Bug: `treesit-install-language-grammar` adds repeated language entry to `treesit-language-source-alist` causing circular list. Recipe to reproduce: 1. `M-x treesit-install-language-grammar` `bash` (enter all defaults) 2. `M-x treesit-install-language-grammar` `bash` In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.33, cairo version 1.16.0) of 2023-10-21 built on noah-X580VD Repository revision: 6f87ee0e3a0727e16079778a4264e6e35cd7f3a8 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101004 System Description: Ubuntu 22.04.3 LTS Configured using: 'configure --prefix=/usr/local --with-modules --with-tree-sitter --with-threads --with-x-toolkit=gtk3 --with-xwidgets --with-gnutls --with-json --with-mailutils --with-jpeg --with-png --with-rsvg --with-tiff --with-xml2 --with-xpm --with-imagemagick CC=gcc-12 CXX=gcc-12' --0000000000003d03550608456f0c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Tags: patch


* lisp/treesit.el (= treesit-install-language-grammar): fix recipe
addition to `treesit-langu= age-source-alist`

Bug: `treesit-install-language-grammar` adds repea= ted language
entry to `treesit-language-source-alist` causing circular l= ist.

Recipe to reproduce:
1. `M-x treesit-install-language-gramma= r` `bash` (enter all defaults)
2. `M-x treesit-install-language-grammar`= `bash`

In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Ver= sion
3.24.33, cairo version 1.16.0) of 2023-10-21 built on noah-X580VDRepository revision: 6f87ee0e3a0727e16079778a4264e6e35cd7f3a8
Reposito= ry branch: master
Windowing system distributor 'The X.Org Foundation= ', version 11.0.12101004
System Description: Ubuntu 22.04.3 LTS
<= br>Configured using:
=C2=A0'configure --prefix=3D/usr/local --with-m= odules --with-tree-sitter
--with-threads --with-x-toolkit=3Dgtk3 --with-= xwidgets --with-gnutls
--with-json --with-mailutils --with-jpeg --with-p= ng --with-rsvg
--with-tiff --with-xml2 --with-xpm --with-imagemagick CC= =3Dgcc-12
CXX=3Dgcc-12'
--0000000000003d03550608456f0c-- --0000000000003d03560608456f0e Content-Type: text/x-patch; charset="US-ASCII"; name="fix-treesit-install.patch" Content-Disposition: attachment; filename="fix-treesit-install.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lo0w3eqt0 RnJvbSA5OTY4YWI0YzIyM2UxZjY1YWI2OTg0NTQzY2I2M2QzYzlkNjI4NjBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBudmVybm8gPG5vYWgudi5wZWFydEBnbWFpbC5jb20+CkRhdGU6 IFNhdCwgMjEgT2N0IDIwMjMgMTk6NTQ6MTAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBGaXggdHJl ZXNpdC1pbnN0YWxsLWxhbmd1YWdlLWdyYW1tYXIgcmVjaXBlIGFkZGl0aW9uCgotLS0KIGxpc3Av dHJlZXNpdC5lbCB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxl dGlvbigtKQoKZGlmZiAtLWdpdCBhL2xpc3AvdHJlZXNpdC5lbCBiL2xpc3AvdHJlZXNpdC5lbApp bmRleCA4MGJkZjE2NGIwNy4uODEwMGU0MTgzMDMgMTAwNjQ0Ci0tLSBhL2xpc3AvdHJlZXNpdC5l bAorKysgYi9saXNwL3RyZWVzaXQuZWwKQEAgLTMzNTQsNyArMzM1NCw3IEBAIHRyZWVzaXQtaW5z dGFsbC1sYW5ndWFnZS1ncmFtbWFyCiAgICAgICAgICAgICAgICAgICAgICAgICAgICIgIikpKQog ICAgICAgICAgICAgICA7OyBJZiBzdWNjZXNzLCBTYXZlIHRoZSByZWNpcGUgZm9yIHRoZSBjdXJy ZW50IHNlc3Npb24uCiAgICAgICAgICAgICAgIChzZXRmIChhbGlzdC1nZXQgbGFuZyB0cmVlc2l0 LWxhbmd1YWdlLXNvdXJjZS1hbGlzdCkKLSAgICAgICAgICAgICAgICAgICAgcmVjaXBlKSkpKQor ICAgICAgICAgICAgICAgICAgICAoY2RyIHJlY2lwZSkpKSkpCiAgICAgICAoZXJyb3IKICAgICAg ICAoZGlzcGxheS13YXJuaW5nCiAgICAgICAgICd0cmVlc2l0Ci0tIAoyLjM0LjEKCg== --0000000000003d03560608456f0e--