From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "J.P." Newsgroups: gmane.emacs.bugs Subject: bug#51753: ERC switches to channel buffer on reconnect Date: Sun, 21 Nov 2021 14:54:14 -0800 Message-ID: <87sfvp5dd5.fsf__2485.14411957643$1637535322$gmane$org@neverwas.me> References: <877ddfgz8q.fsf__46160.5365084083$1636600524$gmane$org@neverwas.me> <87bl2re5eg.fsf@gnus.org> <87lf1ve0m4.fsf@neverwas.me> <877ddf9sht.fsf@gnus.org> <87czmwjutj.fsf@neverwas.me> <87ilwnnvfs.fsf@neverwas.me> 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="29273"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: Lars Ingebrigtsen , emacs-erc@gnu.org, Amin Bandali , 51753@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Nov 21 23:55:15 2021 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 1movjq-0007DX-UI for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 21 Nov 2021 23:55:11 +0100 Original-Received: from localhost ([::1]:47736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1movjp-0006fY-4B for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 21 Nov 2021 17:55:09 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:38110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1movji-0006fA-Oe for bug-gnu-emacs@gnu.org; Sun, 21 Nov 2021 17:55:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1movji-00038O-GS for bug-gnu-emacs@gnu.org; Sun, 21 Nov 2021 17:55:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1movji-0001To-FC for bug-gnu-emacs@gnu.org; Sun, 21 Nov 2021 17:55:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 21 Nov 2021 22:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51753 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 51753-submit@debbugs.gnu.org id=B51753.16375352685640 (code B ref 51753); Sun, 21 Nov 2021 22:55:02 +0000 Original-Received: (at 51753) by debbugs.gnu.org; 21 Nov 2021 22:54:28 +0000 Original-Received: from localhost ([127.0.0.1]:46289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1movj9-0001Su-GZ for submit@debbugs.gnu.org; Sun, 21 Nov 2021 17:54:27 -0500 Original-Received: from mail-108-mta145.mxroute.com ([136.175.108.145]:46497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1movj7-0001Sg-Lq for 51753@debbugs.gnu.org; Sun, 21 Nov 2021 17:54:26 -0500 Original-Received: from filter004.mxroute.com ([149.28.56.236] filter004.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta145.mxroute.com (ZoneMTA) with ESMTPSA id 17d44b51350000177f.001 for <51753@debbugs.gnu.org> (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Sun, 21 Nov 2021 22:54:17 +0000 X-Zone-Loop: 31472274994f7f27c37b398e7619c22d31b6de333851 X-Originating-IP: [149.28.56.236] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:References: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ESR1uVjdMM2m+DLxAs5YSqdzZTpz2LKsFlryZtMHK5U=; b=BWJ2oVrUfMqAwnG4eK5P/pTrRc jhCgtS/Bj/0+tEhAhr1DUoYeDZV6c7lfk7iFbCYcGv8YmT+KkiIGAWvFa3M6tjhLPyhesGIWqMYdI BH5RWDtb9eTLakhPnHyqF+HXeLXPdEgv94RIwj+CLsxUKR79Z53j4AEQbTQ1RT/RTkHc1mq3W/KBF 3NSUmYBZHArnja56VLq70eDCfLd0rDfQXOKqLtZYFAP58oAjz7kFIcCUtbOPtZxLx/y6uAhJ25T1r A4f/6tqgfQXQWevg0inwLThpS1urEqbQvyu+hSBmVjFO66us2ekCTqAH2cM0zPk1sUZ4i7vVN+MoB pG6pzdRQ==; In-Reply-To: (Stefan Kangas's message of "Sat, 20 Nov 2021 10:09:08 +0100") X-AuthUser: masked@neverwas.me X-Zone-Spam-Resolution: no action X-Zone-Spam-Status: No, score=-0.1, required=15, tests=[ARC_NA=0, FROM_HAS_DN=0, TO_DN_SOME=0, HAS_ATTACHMENT=0, FROM_EQ_ENVFROM=0, MIME_TRACE=0, MIME_GOOD=-0.1, RCPT_COUNT_FIVE=0, MID_RHS_MATCH_FROM=0, RCVD_COUNT_ZERO=0, NEURAL_SPAM=0] 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" Xref: news.gmane.io gmane.emacs.bugs:220599 Archived-At: --=-=-= Content-Type: text/plain Stefan Kangas writes: > "J.P." writes: > >> It just occurred to me that we may also want to reset >> `erc--server-last-reconnect-count' at some point after all (re)JOINing >> is done with (both client- and server-initiated) so that the option >> `erc-join-buffer' regains precedence over `erc-reconnect-display' for >> the remainder of the connection. Doing so in `erc-cmd-JOIN' would cover >> manually issued /JOINs as well as invocations of `erc-join-channel'. > > Sounds good to me. Great. Added. Thanks. Updated tests: https://gitlab.com/jpneverwas/erc-v3/-/blob/454ef4674af3d784bb47a81db5e7d526fb30a705/test/erc-scenarios.el#L1642 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0000-v2-v3.diff >From a9c084d4dbfad1e34e23f1d2451a34beadfdc258 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Sun, 21 Nov 2021 00:40:31 -0800 Subject: NOT A PATCH F. Jason Park (1): Customize displaying of ERC buffers on reconnect lisp/erc/erc-backend.el | 3 +++ lisp/erc/erc.el | 24 ++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) Interdiff: diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 01be8ed397..181da76f8e 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -3243,6 +3243,7 @@ erc-cmd-JOIN (switch-to-buffer (if (get-buffer chnl-name) chnl-name (concat chnl-name "/" server))) + (setq erc--server-last-reconnect-count 0) (erc-server-join-channel server chnl key))))) t) -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Customize-displaying-of-ERC-buffers-on-reconnect.patch >From a9c084d4dbfad1e34e23f1d2451a34beadfdc258 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 18 Nov 2021 23:39:54 -0800 Subject: [PATCH 1/1] Customize displaying of ERC buffers on reconnect * lisp/erc/erc-backend.el (erc--server-last-reconnect-count): Add variable to record last reconnect tally. * lisp/erc/erc.el (erc-reconnect-buffer): Add option to specify channel-buffer display behavior on reconnect. (erc-setup-buffer): Use option `erc-reconnect-buffer' if warranted. (erc-connection-established): Record reconnect count in internal var before resetting. (erc-cmd-JOIN): Forget last reconnect count when issuing a manual /JOIN command. --- lisp/erc/erc-backend.el | 3 +++ lisp/erc/erc.el | 24 ++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 69f63dfbc4..0d586268e9 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -193,6 +193,9 @@ erc-server-connected (defvar-local erc-server-reconnect-count 0 "Number of times we have failed to reconnect to the current server.") +(defvar-local erc--server-last-reconnect-count 0 + "Snapshot of reconnect count when the connection was established.") + (defvar-local erc-server-quitting nil "Non-nil if the user requests a quit.") diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index c5a4fbe5a0..181da76f8e 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1521,6 +1521,21 @@ erc-join-buffer (const :tag "Use current buffer" buffer) (const :tag "Use current buffer" t))) +(defcustom erc-reconnect-display nil + "How (and whether) to display a channel buffer upon reconnecting. + +This only affects automatic reconnections and is ignored when issuing a +/reconnect command or reinvoking `erc-tls' with the same args (assuming +success, of course). See `erc-join-buffer' for a description of +possible values." + :group 'erc-buffers + :type '(choice (const :tag "Use value of `erc-join-buffer'" nil) + (const :tag "Split window and select" window) + (const :tag "Split window, don't select" window-noselect) + (const :tag "New frame" frame) + (const :tag "Bury in new buffer" bury) + (const :tag "Use current buffer" buffer))) + (defcustom erc-frame-alist nil "Alist of frame parameters for creating erc frames. A value of nil means to use `default-frame-alist'." @@ -1950,7 +1965,10 @@ erc-update-modules (defun erc-setup-buffer (buffer) "Consults `erc-join-buffer' to find out how to display `BUFFER'." - (pcase erc-join-buffer + (pcase (if (zerop (erc-with-server-buffer + erc--server-last-reconnect-count)) + erc-join-buffer + (or erc-reconnect-display erc-join-buffer)) ('window (if (active-minibuffer-window) (display-buffer buffer) @@ -3225,6 +3243,7 @@ erc-cmd-JOIN (switch-to-buffer (if (get-buffer chnl-name) chnl-name (concat chnl-name "/" server))) + (setq erc--server-last-reconnect-count 0) (erc-server-join-channel server chnl key))))) t) @@ -4722,7 +4741,8 @@ erc-connection-established (nick (car (erc-response.command-args parsed))) (buffer (process-buffer proc))) (setq erc-server-connected t) - (setq erc-server-reconnect-count 0) + (setq erc--server-last-reconnect-count erc-server-reconnect-count + erc-server-reconnect-count 0) (erc-update-mode-line) (erc-set-initial-user-mode nick buffer) (erc-server-setup-periodical-ping buffer) -- 2.31.1 --=-=-=--