From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Emanuel Berg Newsgroups: gmane.emacs.bugs,gmane.emacs.erc.general Subject: bug#68401: 30.0.50; ERC 5.6-git: `erc-cmd-GMSG', `erc-cmd-AMSG', `erc-cmd-GME', `erc-cmd-AME'. 2nd attempt Date: Sat, 17 Feb 2024 06:21:18 +0100 Message-ID: <8734tr4qep.fsf@dataswamp.org> References: <87v87yvnly.fsf@dataswamp.org> <834jfikb4d.fsf@gnu.org> <87mstavias.fsf@dataswamp.org> <87wmseoskl.fsf@dataswamp.org> <87plxyowpg.fsf__13716.8874776521$1705633220$gmane$org@neverwas.me> <87il3ki2tg.fsf@dataswamp.org> <87il3jh8mu.fsf__35629.5012797759$1706056526$gmane$org@neverwas.me> <87il3jh64c.fsf@dataswamp.org> <87jznzf0dz.fsf@dataswamp.org> <87h6j3eyir.fsf@dataswamp.org> <87a5of68c7.fsf@dataswamp.org> <87h6im9ryz.fsf__23711.5776095138$1707191176$gmane$org@neverwas.me> <87h6if4tw2.fsf@dataswamp.org> <87eddj4qzc.fsf@dataswamp.org> <87a5o74pyy.fsf@dataswamp.org> <87eddfhle8.fsf__42581.6363118187$1707874989$gmane$org@neverwas.me> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35722"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-erc@gnu.org To: 68401@debbugs.gnu.org Cancel-Lock: sha1:Ya+wjjtFvLNF9C4MexPDgTy3a+4= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 18 19:23:18 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 1rblor-00092o-KW for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 18 Feb 2024 19:23:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbloL-0007he-Rl; Sun, 18 Feb 2024 13:22:46 -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 1rbloK-0007dq-C0 for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 13:22:44 -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 1rbloJ-0002bP-CT for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 13:22:44 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rblod-00036S-VW for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 13:23:03 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <87v87yvnly.fsf@dataswamp.org> Resent-From: Emanuel Berg Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Feb 2024 18:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68401 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.170828054811701 (code B ref -1); Sun, 18 Feb 2024 18:23:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:22:28 +0000 Original-Received: from localhost ([127.0.0.1]:37062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblo3-00032d-K3 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:22:28 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:53956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblRh-0001mW-3S for submit@debbugs.gnu.org; Sun, 18 Feb 2024 12:59:21 -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 1rbD8t-0006ZM-SB for bug-gnu-emacs@gnu.org; Sat, 17 Feb 2024 00:21:39 -0500 Original-Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbD8s-0004SX-3j for bug-gnu-emacs@gnu.org; Sat, 17 Feb 2024 00:21:39 -0500 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1rbD8p-0000x5-2M for bug-gnu-emacs@gnu.org; Sat, 17 Feb 2024 06:21:35 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: bug-gnu-emacs@gnu.org Original-Followup-To: gmane.emacs.bugs,gmane.emacs.erc.general Mail-Copies-To: never Received-SPF: pass client-ip=116.202.254.214; envelope-from=geb-bug-gnu-emacs@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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:280177 gmane.emacs.erc.general:2439 Archived-At: J.P. wrote: >> (erc-cmd-GMSG, erc-cmd-AME, erc-cmd-GME): new IRC slash commands > ^ ^ > From CONTRIBUTE: > > Some commenting rules in the GNU coding standards also > apply to ChangeLog entries: they must be in English, and > be complete sentences starting with a capital and ending > with a period (except the summary line should not end in > a period). What do you mean, should that be "New IRC slash commands."? If so, maybe I can change it with 'git commit --amend'. But how do I then generate a new patch, just with 'git format-patch master -M -o .ib'? >> Fixed bug in erc-cmd-GME >> >> * lisp/erc/erc.el (erc-cmd-GME): should be #'erc--connected-and-joined-p, >> not (erc--connected-and-joined-p) >> (Bug#68401) > > This last item appears to describe an incremental patch > revision only known to this discussion thread on the > tracker. These log messages are instead meant to reflect the > entirety of the proposed changeset relative to what's > currently on master. However, something like this might > still be helpful in the body of a discussion post (email). What should the commit message be then for such changes? Nothing at all? Then It will complain it doesn't work. I can write a bogus message, then squash the commits and remove it from the final one, I guess. >> Test and files added >> >> * test/lisp/erc/erc-scenarios-misc-commands.el >> (erc-scenarios-misc-commands--AMSG-GMSG-AME-GME): New test. >> * test/lisp/erc/resources/commands/amsg-barnet.eld: New file. >> * test/lisp/erc/resources/commands/amsg-foonet.eld: New file. >> >> Added a note on `erc-cmd-AMGS' and its three new friends >> >> * etc/ERC-NEWS: Mentioned here. > > FWIW, other Emacs commit messages don't seem to have these > interspersed sub-headers, like "Fixed bug in erc-cmd-GME" > and "Test and files added". They are from the squashed commits. You told me to use it instead of fixup since that would keep the commit messages. I can remove them like above, maybe, if that's what you are saying? If so, please provide a commit message exactly the way it should be since this has been back and forth so many times by now. > Also, bug fixes aren't really announced unless they threaten > to cause widespread churn or introduce potentially > debilitating breakage, so you can probably just leave that > out and only mention the new commands. Okay. >> +Also, the new IRC slash commands `erc-cmd-GMSG', >> +`erc-cmd-AME', and `erc-cmd-GME' were added and are available > ^~~~~~~~~~~~^ > > For etc/*NEWS, I believe they prefer single 'quotes' for > literal text rather than traditional ones with an > opening backtick. Again, maybe it is easier it you just supply the whole message exactly as intended as this back and forth one million times is not getting us anywhere. >> + >> ** Module 'keep-place' has a more decorative cousin. >> Remember your place in ERC buffers a bit more easily with the help of >> a configurable, visible indicator. Optionally sync the indicator to >> @@ -1367,7 +1373,7 @@ reconnection attempts that ERC will make per server. >> in seconds, that ERC will wait between successive reconnect attempts. >> >> *** erc-server-send-ping-timeout: Determines when to consider a connection >> -stalled and restart it. The default is after 120 seconds. >> +stalled and restart it. The default is after 120 seconds. > ~~~ > > Please collapse the expanded TAB into a single space. >> >> *** erc-system-name: Determines the system name to use when logging in. >> The default is to figure this out by calling `system-name'. >> @@ -2386,5 +2392,5 @@ Local variables: >> coding: utf-8 >> mode: outline >> mode: emacs-news >> -paragraph-separate: "[ ]*$" >> +paragraph-separate: "[ ]*$" > ^ > I believe the TAB here is intentional, so please undo this hunk. Oh, no! It is the same thing that happened with the Elisp file, tabs were changed into spaces when I saved. I only disabled that for Elisp so it did happen again for etc/ERC-NEWS as that isn't Elips. But if it were just two cases, maybe I can change it them back manually. After commiting that, should I do the whole chain again? Is that the preferred way, really? One would feel there would be an easier way, but if it so, that's what it is. $ git log --graph --oneline --decorate -a $ git rebase -i HEAD~2 $ git pull $ git rebase --onto origin/master 'ib^' ib $ git format-patch master -M -o .ib ? -- underground experts united https://dataswamp.org/~incal