From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: john muhl Newsgroups: gmane.emacs.bugs Subject: bug#74499: [PATCH] Avoid loading 'rx' at runtime in 'lua-ts-mode' Date: Sat, 23 Nov 2024 17:08:37 -0600 Message-ID: <87h67xczuy.fsf@pub.pink> References: <87o725czz8.fsf@pub.pink> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5528"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.12.1; emacs 31.0.50 Cc: philipk@posteo.net To: 74499@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Nov 24 00:09:19 2024 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 1tEzFd-0001Gi-7D for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 24 Nov 2024 00:09:18 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tEzFU-0003G0-Ug; Sat, 23 Nov 2024 18:09:09 -0500 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 1tEzFO-0003Fj-NK for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2024 18:09:03 -0500 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 1tEzFO-0006dt-E9 for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2024 18:09:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=2ReLPKnVPi8yIPjgIYjUBNo7rjS53yUn4K4KjNv2ekI=; b=SyOxZyP+9lgG2BghtpwZDGSSArK8c4nTqPzjb/LbmdBtGsh3dJIx7yraur/6QkM/yd2ZSNasNtdmZNAoFrLjEWfs3beiFBwhesg9JChqsz+1xlsMLoIuvzj6GgBoHH/7hw6ylrUd7fUG4rD8L9K3i43/ZhcAWENRrJD3Z8LFWQUVwpz7H6O9mwA4fDLogXYX8pfpD7L4wR+9j2czX6KBWZqszJcqyZ08zdf1tamCXx7vPXrsySOi7YZUk9Eq0KmpMAoeJ0ec2BRXHCjbgR1ZbId9i2nUR2hT5dt1Y9a8lyIWJtUTJxPDvzSRuOJ3IDMH2Dfc8WVO2Z2jai1QXLxPOA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tEzFO-00041T-8N for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2024 18:09:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: john muhl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 23 Nov 2024 23:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74499 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 74499-submit@debbugs.gnu.org id=B74499.173240332515435 (code B ref 74499); Sat, 23 Nov 2024 23:09:02 +0000 Original-Received: (at 74499) by debbugs.gnu.org; 23 Nov 2024 23:08:45 +0000 Original-Received: from localhost ([127.0.0.1]:59862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tEzF7-00040t-AD for submit@debbugs.gnu.org; Sat, 23 Nov 2024 18:08:45 -0500 Original-Received: from fhigh-a4-smtp.messagingengine.com ([103.168.172.155]:40953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tEzF5-00040b-Fp for 74499@debbugs.gnu.org; Sat, 23 Nov 2024 18:08:44 -0500 Original-Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 5A2771140083; Sat, 23 Nov 2024 18:08:38 -0500 (EST) Original-Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Sat, 23 Nov 2024 18:08:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1732403318; x=1732489718; bh=2ReLPKnVPi 8yIPjgIYjUBNo7rjS53yUn4K4KjNv2ekI=; b=VfSE3O+BeL3FwZ0zjj1zGaq6r8 in9knNuahfDVTTeyvJ2cgZB7PxHyGEYNANN3wrMGQkyH6KJ+5ojd0t0xugImqLXU qORtl5QpNFr+IQuNBTN11Jb309YWMFMryXSsYW6H/Mzb522crEVwM1jqVbCOxGpH YOq3v5qV4LdcxsXZAiC0ESqrnfzSljMGn5e5ob56zsgo4AbfdEGK4xXi/LU033PM TBQWHxCsNY6ZH2LsO6KdSXVX9lOeiaWXjc3XrmVWT/PjSkU7a9FbFFZhgRvRUJFu yRiLCsXmdx5KOgbQ9kgG7+Q3MlXE0IiC2nuaqddtwa3gJHcuQpnw6BGhMvYw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1732403318; x=1732489718; bh=2ReLPKnVPi8yIPjgIYjUBNo7rjS53yUn4K4 KjNv2ekI=; b=xpXlWj06pgF5ZbCSpawzGH48OCVR6a9iXfHZOtToFkNEMDpipqR Y8d3wFQtYOQynKMQr5hEhBJjP6F/bLbiqGahEmhez+wn4+ggw9+geDzBZ6AgpDD0 ZnFD+P/GZC5T6cz+A6KYVwunOfVI3svGRAI/ETUbDT6RMVADNTAjgimJRVy8D09Y INyOqRDqW1K28ACYnSbJQhpGe43cah58U7JX4lRRT8FcrYQgKT8p7AMKi6C3z78l NGamDp2e4ClmNUskHTiveCcFJj9XicMvFl8chPRmCO9lomlKhqBtRMICkTPPzqQt BFaztmjM3MzvJqglM42/1zVw2oyROzv7oXA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrgedvgddtiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefujg hffgffkfggtgesmhdtreertdertdenucfhrhhomhepjhhohhhnuchmuhhhlhcuoehjmhes phhusgdrphhinhhkqeenucggtffrrghtthgvrhhnpeffudeltdffhfejudehgefhfeeltd efteffgfdtveelieduheeuffdujeevffdvtdenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehjmhesphhusgdrphhinhhkpdhnsggprhgtphhtth hopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehphhhilhhiphhksehpohhs thgvohdrnhgvthdprhgtphhtthhopeejgeegleelseguvggssghughhsrdhgnhhurdhorh hg X-ME-Proxy: Feedback-ID: i74194916:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 23 Nov 2024 18:08:37 -0500 (EST) In-Reply-To: <87o725czz8.fsf@pub.pink> (john muhl's message of "Sat, 23 Nov 2024 17:06:03 -0600") 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:295875 Archived-At: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Avoid-loading-rx-at-runtime-in-lua-ts-mode.patch >From 309e80a336bce5c4a9191c87af636b8adfc04b97 Mon Sep 17 00:00:00 2001 From: john muhl Date: Sat, 23 Nov 2024 14:08:21 -0600 Subject: [PATCH] Avoid loading 'rx' at runtime in 'lua-ts-mode' * lisp/progmodes/lua-ts-mode.el (lua-ts-inferior-lua): Replace 'rx-to-string' and substitution with 'rx' and 'literal'. (Bug#74499) --- lisp/progmodes/lua-ts-mode.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el index f88fe0e49af..828636f359d 100644 --- a/lisp/progmodes/lua-ts-mode.el +++ b/lisp/progmodes/lua-ts-mode.el @@ -659,9 +659,9 @@ lua-ts-inferior-lua (setq-local comint-input-ignoredups t comint-input-ring-file-name lua-ts-inferior-history comint-prompt-read-only t - comint-prompt-regexp (rx-to-string `(: bol - ,lua-ts-inferior-prompt - (1+ space)))) + comint-prompt-regexp (rx bol + (literal lua-ts-inferior-prompt) + (1+ space))) (comint-read-input-ring t) (add-hook 'comint-preoutput-filter-functions (lambda (string) @@ -672,11 +672,11 @@ lua-ts-inferior-lua ;; accumulate in the output when sending regions ;; to the inferior process. (replace-regexp-in-string - (rx-to-string `(: bol - (* ,lua-ts-inferior-prompt - (? ,lua-ts-inferior-prompt) - (1+ space)) - (group (* nonl)))) + (rx bol + (* (literal lua-ts-inferior-prompt) + (? (literal lua-ts-inferior-prompt)) + (1+ space)) + (group (* nonl))) "\\1" string) ;; Re-add the prompt for the next line. lua-ts-inferior-prompt " "))) -- 2.47.0 --=-=-= Content-Type: text/plain john muhl writes: > Tags: patch > > Philip mentioned changing these rx-to-string forms to use literal > over in bug#74235. I meant to include them there but guess it > slipped my mind. --=-=-=--