From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#43275: Upgrade antlr-mode to latest version Date: Sun, 4 Feb 2024 07:15:07 -0500 Message-ID: References: <8E743CED-49F8-4D74-A289-389CCAD6F330@sap.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33281"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 43275@debbugs.gnu.org To: "Wedler, Christoph" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 04 13:16:10 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 1rWbPt-0008S1-LC for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 04 Feb 2024 13:16:09 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWbPd-0002Db-Uj; Sun, 04 Feb 2024 07:15:53 -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 1rWbPa-0002DM-QQ for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 07:15:51 -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 1rWbPa-0002Ej-39 for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 07:15:50 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWbPl-0003WX-QV for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 07:16:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 04 Feb 2024 12:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43275 X-GNU-PR-Package: emacs Original-Received: via spool by 43275-submit@debbugs.gnu.org id=B43275.170704892813503 (code B ref 43275); Sun, 04 Feb 2024 12:16:01 +0000 Original-Received: (at 43275) by debbugs.gnu.org; 4 Feb 2024 12:15:28 +0000 Original-Received: from localhost ([127.0.0.1]:48273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWbPD-0003Vj-PU for submit@debbugs.gnu.org; Sun, 04 Feb 2024 07:15:28 -0500 Original-Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:43462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWbPC-0003VU-0H for 43275@debbugs.gnu.org; Sun, 04 Feb 2024 07:15:26 -0500 Original-Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-560589aa581so316036a12.1 for <43275@debbugs.gnu.org>; Sun, 04 Feb 2024 04:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707048908; x=1707653708; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=jYSl2rw72Tiz97CR0Nd6bkayi+NcsiuN/IOOqHDoSTM=; b=j66CQwBmz1TEWsw6el9CM/vw0IvU1Mm2NsG91e9YkgLsvd7pO6n6btGH4n6KBM2W/K 0LUXxxUP2PGVj/KzhRtAcz8Y5PEmQ17/OqZ5O/CkszzdqrfvmjaBvV6R0yXDMBL6oaq6 76eZFPOCmj9BFFS7b6GJmsokfR8ClvoBmkKAWDC218v0lFphucECK40Tuqi6BdzdSW+X 4GWleCqGZ9k+AGe1ifNTp7TVU7psxPBeYqrYBwPnCgiYAluqrkgF6CvIFifwiXs3T81J 152tm3OqR5y7w8IuquODbHGIMMXrdS3dZqv8ibfVi8VcVjuvhDdYC4kyIU8610jZCyQQ 0FtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707048908; x=1707653708; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jYSl2rw72Tiz97CR0Nd6bkayi+NcsiuN/IOOqHDoSTM=; b=L4j68O9htJHq3wHgW88nU5SIpARU0g9dMflz0gG3yvYVJ4wgEBYXaCaVFOTr2Sf6Sn 23Uy5Te1xmE+EZV6PnbmvkVB1no/p2WbB9WUd/dl1etLg1RT9cAY0CmAoeItuHh+H7yq zG3F5/vJmFlmzPky/WlKCe8No8JvSGyp7+yi55fTUjYI/weXnJ7wfXiTs5jdYfS66Hhd wd7GEzQcjqiNljfsVGbJTU2oc6idomPHVMu9zhhfdWn2RQHj7VKY4oAd7VYYU9GPqfXk QuGD1btwJMB64bVAo+aXH4nIjC2CFhVrAck/UdMIYfZlh9D0OMIVrTE5AiRLBteVXR0O Bfzw== X-Gm-Message-State: AOJu0YxcWvOo3+jEFX5AU5TiBCDm7ogeeWU7KQl9feT5eoN+Or9Kn9Xc kJSj4P4+emrBuNzGoy6D7B4g+OqwVMKK1pnkRsHkwuCk5NFucI19vI3iShtAepYO8l7Jg57kMg9 2HTk6nt4m101q4l4yv0WCGvp+YmU= X-Google-Smtp-Source: AGHT+IFP0q4bf0gaPepkESqPpEJDlZNDF7qIhhwIrxset+gAxYB3z0aSNPDzxF0BEQzXsePn9U85UoY853fpkmois6M= X-Received: by 2002:a05:6402:d5a:b0:560:3165:3fce with SMTP id ec26-20020a0564020d5a00b0056031653fcemr2616557edb.8.1707048907882; Sun, 04 Feb 2024 04:15:07 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 4 Feb 2024 07:15:07 -0500 In-Reply-To: (Stefan Kangas's message of "Wed, 9 Sep 2020 08:28:23 -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:279403 Archived-At: Dear Christoph, The last time we discussed this was three years ago, and this fell off my radar. I'm hoping we could pick up the thread now. Did you make any progress with merging the changes in Emacs into your tree? I think this is still blocking merging the latest version of antlr-mode into Emacs. I think the best workflow here is that you merge all changes you like, release that as a new version 3.1.6, and then we can just install that version into Emacs. The other option is that we do the work of merging the changes and send a new proposed version 3.1.6 to you. Supposedly, you will then want to release it on SourceForge. It will be harder for you to review any changes on the Emacs side, of course, and it will be a bit more error-prone since the merge isn't handled by the person that knows the code best. Thanks in advance. Stefan Kangas writes: > "Wedler, Christoph" writes: > >> OK - I would basically do M-x emerge-files-with-ancestor: >> >> - A: my antlr-mode.el 3.1.5 >> - B: lisp/progmodes/antlr-mode.el >> - Ancestor: lisp/progmodes/antlr-mode.el.~emacs-25.1~ (see my ChangeLog comment 2016-11-22), >> >> Does that sounds reasonable? > > I've never used that command, so I unfortunately can't help you with > that. Why not just give it a spin and see what happens? :-) > > Another idea is to just manually look over the commits and apply them > one by one to your sources as it makes sense. > >> If someone can guide me how Emacs handles git, I can probably directly push a change >> >> - starting at branch "master"? >> - which branch to push to? > > To get commit access, you will need to apply for it on Savannah. I'm > not sure about the exact requirements to get commit access. > > If it's easier, you could send a patch here and we can push it for you. > >> - change comment: my ChangeLog starting at 2.2c? > > If you send the patch here first, we can look over the formatting. But > if you already have a GNU conforming ChangeLog, it sounds like a good > idea to adapt it for Emacs. If it's much too big to adapt, I think it's > also okay to fall back to something like: > > * lisp/progmodes/antlr-mode.el: Sync with latest upstream.