all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: john muhl <jm@pub.pink>
To: Stefan Kangas <stefankangas@gmail.com>
Cc: Eli Zaretskii <eliz@gnu.org>, 71736@debbugs.gnu.org
Subject: bug#71736: Small cleanup patches for lua-ts-mode
Date: Fri, 28 Jun 2024 11:24:41 -0500	[thread overview]
Message-ID: <871q4h3tfi.fsf@pub.pink> (raw)
In-Reply-To: <CADwFkmn0eCHw1SciuzWc2CuB5c4QB3P6mHH184oy8mK5GAEJDQ@mail.gmail.com> (Stefan Kangas's message of "Thu, 27 Jun 2024 16:05:03 -0700")

[-- Attachment #1: Type: text/plain, Size: 674 bytes --]

Stefan Kangas <stefankangas@gmail.com> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> Discard all of the patches or just that 4/4 part?
>
> I think just the 4/4 part, indeed, so I've installed patches 1 and 3 on
> emacs-30.

Yep. I meant just the one part but of course you can always
discard whatever you like :)

> I think patch 2 should go to master, but it doesn't apply cleanly.
> John, could you please rebase it and resend?

Oops, I see now it included a bit of unrelated local changes.

Here’s another try. I rebased it and checked that it applies to
emacs-30 and master. Out of curiousity, what makes it unfit for
the emacs-30 branch?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Use-keymap-set-in-lua-ts-mode-bug-71736.patch --]
[-- Type: text/x-patch, Size: 1184 bytes --]

From 8a1ba22c7c52f5b35e4ffcc292cef3bd35722a66 Mon Sep 17 00:00:00 2001
From: john muhl <jm@pub.pink>
Date: Wed, 22 May 2024 12:23:19 -0500
Subject: [PATCH] ; Use 'keymap-set' in 'lua-ts-mode' (bug#71736)

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode-map): Replace
'define-key' with 'keymap-set'.
---
 lisp/progmodes/lua-ts-mode.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index 8d0f49c2d89..06daadbc1fd 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -722,10 +722,10 @@ lua-ts-inferior--write-history
 
 (defvar lua-ts-mode-map
   (let ((map (make-sparse-keymap "Lua")))
-    (define-key map "\C-c\C-n" 'lua-ts-inferior-lua)
-    (define-key map "\C-c\C-c" 'lua-ts-send-buffer)
-    (define-key map "\C-c\C-l" 'lua-ts-send-file)
-    (define-key map "\C-c\C-r" 'lua-ts-send-region)
+    (keymap-set map "C-c C-n" 'lua-ts-inferior-lua)
+    (keymap-set map "C-c C-c" 'lua-ts-send-buffer)
+    (keymap-set map "C-c C-l" 'lua-ts-send-file)
+    (keymap-set map "C-c C-r" 'lua-ts-send-region)
     map)
   "Keymap for `lua-ts-mode' buffers.")
 
-- 
2.45.2


  reply	other threads:[~2024-06-28 16:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-23 14:41 bug#71736: Small cleanup patches for lua-ts-mode john muhl
2024-06-23 14:58 ` john muhl
2024-06-23 15:51   ` Stefan Kangas
2024-06-23 16:12     ` john muhl
2024-06-27  9:02       ` Eli Zaretskii
2024-06-27 23:05         ` Stefan Kangas
2024-06-28 16:24           ` john muhl [this message]
2024-06-28 19:56             ` Stefan Kangas
2024-06-28 22:16               ` john muhl
2024-06-29  2:59                 ` Stefan Kangas

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=871q4h3tfi.fsf@pub.pink \
    --to=jm@pub.pink \
    --cc=71736@debbugs.gnu.org \
    --cc=eliz@gnu.org \
    --cc=stefankangas@gmail.com \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.