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#71736: Small cleanup patches for lua-ts-mode Date: Fri, 28 Jun 2024 11:24:41 -0500 Message-ID: <871q4h3tfi.fsf@pub.pink> References: <87ikxzafi5.fsf@pub.pink> <877cefaeoc.fsf@pub.pink> <87bk3r8wpm.fsf@pub.pink> <86msn669o1.fsf@gnu.org> 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="10117"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.12.1; emacs 30.0.50 Cc: Eli Zaretskii , 71736@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jun 28 18:49: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 1sNEmk-0002SR-LU for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 28 Jun 2024 18:49:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNEmW-00008c-FX; Fri, 28 Jun 2024 12:49:04 -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 1sNEmU-00008M-RJ for bug-gnu-emacs@gnu.org; Fri, 28 Jun 2024 12:49:03 -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 1sNEmU-0005NW-J3 for bug-gnu-emacs@gnu.org; Fri, 28 Jun 2024 12:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sNEmU-0003IF-Fl for bug-gnu-emacs@gnu.org; Fri, 28 Jun 2024 12:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: john muhl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Jun 2024 16:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71736 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 71736-submit@debbugs.gnu.org id=B71736.171959329212588 (code B ref 71736); Fri, 28 Jun 2024 16:49:02 +0000 Original-Received: (at 71736) by debbugs.gnu.org; 28 Jun 2024 16:48:12 +0000 Original-Received: from localhost ([127.0.0.1]:46241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNElg-0003Gw-5e for submit@debbugs.gnu.org; Fri, 28 Jun 2024 12:48:12 -0400 Original-Received: from fhigh4-smtp.messagingengine.com ([103.168.172.155]:54183) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNEld-0003Gf-HM for 71736@debbugs.gnu.org; Fri, 28 Jun 2024 12:48:10 -0400 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 26DF31140217; Fri, 28 Jun 2024 12:48:04 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 28 Jun 2024 12:48:04 -0400 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=fm2; t=1719593284; x=1719679684; bh=S+8fD0ZdBq 8oeOP2ulDExTXXknanBpD/BvLI84/ow0o=; b=Cldr58TSxXVKfx8QnQsixHom1s nrFQuXL5//HVGE7fhRHSIVnw44+oYOMhV3sMeA5DWHylxfsQtOKUJe5Wf+h7Mf+P CCeYGKhYmIQNe+GkpVjTeRHklMqWY5faUo6OuRPk7+pZJSvEZ6QFJ0zB+SA/+Rqk HWGJx64jPh+Iv0ozHonyJpAM9rJV1u9DkPO91fMzN68RAT5MZMCU0fND8Qg7xGT7 74SEFCrz2AqizjJwmEJJATaRD6N3U0lP+d/YsLHPyAZV9BjZujZUNAMtFIKmNwUU Tw93XYXOXxFhcnDJxU4w9jPpml7lf7HbIvFv+pJHTQVXZ/itd5MKr6kNvoww== 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-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1719593284; x=1719679684; bh=S+8fD0ZdBq8oeOP2ulDExTXXknan BpD/BvLI84/ow0o=; b=qs82cUQb4sGn/55TAPpjVJ4pbi6fGn7OvVhPYjnFLwza yplPIOvyvpXycCampvtK4dmUdIINl+7m6IRIZFDyRVkieGWrupRmp+38stfqghIW XrJOoUN0jAwAVZscSE6ME9l1HS/uLc30LLj2DGdps6VFGZpBUhLdaHCiQnQhr1M9 BYX2v1E6q2zuGQI8p7eHfeImnU6RpTOWuYXLr/9UndpCU5/ZbAOgsPdBW7ZxalRa e98eWmXs0M9DFeRSo+Vo+xQtWTRZ2+hkfvwXrWYzcTkeE9lgnS53+u4IUgxbYSom dUJSirfjvK7OvNVWCRCxNSVfTN0y+eRapwzHjL/yxQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrtdejgdeglecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufgjffhffgfkgggtsehmtderredtreejnecuhfhrohhmpehjohhhnhcu mhhuhhhluceojhhmsehpuhgsrdhpihhnkheqnecuggftrfgrthhtvghrnhepjedvleduge elfeeigedtudetvedvleeifffghfduhfdugffhgeevvdegffdvhfevnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhmsehpuhgsrdhpihhnkh X-ME-Proxy: Feedback-ID: i74194916:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 28 Jun 2024 12:48:03 -0400 (EDT) In-Reply-To: (Stefan Kangas's message of "Thu, 27 Jun 2024 16:05:03 -0700") 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:288077 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Stefan Kangas writes: > Eli Zaretskii 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=E2=80=99s 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? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Use-keymap-set-in-lua-ts-mode-bug-71736.patch >From 8a1ba22c7c52f5b35e4ffcc292cef3bd35722a66 Mon Sep 17 00:00:00 2001 From: john muhl 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 --=-=-=--