From: john muhl <jm@pub.pink>
To: 74499@debbugs.gnu.org
Cc: philipk@posteo.net
Subject: bug#74499: [PATCH] Avoid loading 'rx' at runtime in 'lua-ts-mode'
Date: Sat, 23 Nov 2024 17:08:37 -0600 [thread overview]
Message-ID: <87h67xczuy.fsf@pub.pink> (raw)
In-Reply-To: <87o725czz8.fsf@pub.pink> (john muhl's message of "Sat, 23 Nov 2024 17:06:03 -0600")
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-Avoid-loading-rx-at-runtime-in-lua-ts-mode.patch --]
[-- Type: text/x-patch, Size: 2327 bytes --]
From 309e80a336bce5c4a9191c87af636b8adfc04b97 Mon Sep 17 00:00:00 2001
From: john muhl <jm@pub.pink>
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
[-- Attachment #2: Type: text/plain, Size: 202 bytes --]
john muhl <jm@pub.pink> 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.
next prev parent reply other threads:[~2024-11-23 23:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-23 23:06 bug#74499: [PATCH] Avoid loading 'rx' at runtime in 'lua-ts-mode' john muhl
2024-11-23 23:08 ` john muhl [this message]
2024-11-24 1:21 ` Stefan Kangas
2024-11-24 8:42 ` Eli Zaretskii
2024-11-24 10:37 ` Stefan Kangas
2024-11-24 19:37 ` Philip Kaludercic
2024-11-26 2:04 ` john muhl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h67xczuy.fsf@pub.pink \
--to=jm@pub.pink \
--cc=74499@debbugs.gnu.org \
--cc=philipk@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).