Subject: Re: bug#67616: [PATCH] Fix: add comint hook locally in lua-ts-inferior-lua

From: john muhl <[email-masked]>
Date: Mon, 04 Dec 2023 12:17:27 -0600

Noah Peart <[email-masked]> writes:

> Yea, that looks good to me.  Is it necessary to set
> `comint-use-prompt-regexp` to `t`?
> The behaviour of `comint-previous/next-prompt` seems better when
> that is nil.
> Thanks!

You’re right. I wasn’t able to get creative enough to merge them
into a single commit so it’s separate.

>From a354925d561725b1df310ca036519c26fb7f081a Mon Sep 17 00:00:00 2001
From: nverno <[email-masked]>
Date: Sun, 3 Dec 2023 19:21:04 -0800
Subject: [PATCH] Fix: add comint hook locally in lua-ts-inferior-lua

* lisp/progmodes/lua-ts-mode.el (lua-ts-inferior-lua): Add
comint-preoutput-filter-functions hook locally.  (bug#67616)
---
 lisp/progmodes/lua-ts-mode.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index 7307a5b13f1..5318144a057 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -560,9 +560,7 @@ lua-ts-inferior-lua
       (comint-read-input-ring t)
       (add-hook 'comint-preoutput-filter-functions
                 (lambda (string)
-                  (if (or (not (equal (buffer-name) lua-ts-inferior-buffer))
-                          (equal string
-                                 (concat lua-ts-inferior-prompt-continue " ")))
+                  (if (equal string (concat lua-ts-inferior-prompt-continue " "))
                       string
                     (concat
                      ;; Filter out the extra prompt characters that
@@ -576,7 +574,8 @@ lua-ts-inferior-lua
                                                     (group (* nonl))))
                                                "\\1" string)
                      ;; Re-add the prompt for the next line.
-                     lua-ts-inferior-prompt " "))))))
+                     lua-ts-inferior-prompt " ")))
+                nil t)))
   (select-window (display-buffer lua-ts-inferior-buffer
                                  '((display-buffer-reuse-window
                                     display-buffer-pop-up-frame)
-- 
2.41.0

>From 939c0d0144551b664f03ea5ac9486c2f02f295e1 Mon Sep 17 00:00:00 2001
From: john muhl <[email-masked]>
Date: Mon, 4 Dec 2023 12:03:34 -0600
Subject: [PATCH] Fix comint-next/previous-prompt in lua-ts-mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/progmodes/lua-ts-mode.el (lua-ts-inferior-lua): Don’t set
`comint-use-prompt-regexp'.  (bug#67616)
---
 lisp/progmodes/lua-ts-mode.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index 5318144a057..cbf0e573e37 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -552,7 +552,6 @@ lua-ts-inferior-lua
     (with-current-buffer lua-ts-inferior-buffer
       (setq-local comint-input-ignoredups t
                   comint-input-ring-file-name lua-ts-inferior-history
-                  comint-use-prompt-regexp t
                   comint-prompt-read-only t
                   comint-prompt-regexp (rx-to-string `(: bol
                                                          ,lua-ts-inferior-prompt
-- 
2.41.0