From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Mingde (Matthew) Zeng" Newsgroups: gmane.emacs.devel Subject: [PATCHv2] erc: fix erc-reuse-buffers behavior Date: Tue, 11 Aug 2020 14:53:48 -0400 Message-ID: <87h7t9ovyb.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4498"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.4.13; emacs 27.0.91 Cc: larsi@gnus.org To: 40121@debbugs.gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Aug 11 20:54:31 2020 Return-path: Envelope-to: ged-emacs-devel@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 1k5ZPr-00014R-Iu for ged-emacs-devel@m.gmane-mx.org; Tue, 11 Aug 2020 20:54:31 +0200 Original-Received: from localhost ([::1]:38750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5ZPq-0000ar-Lg for ged-emacs-devel@m.gmane-mx.org; Tue, 11 Aug 2020 14:54:30 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5ZPG-00008u-2b for emacs-devel@gnu.org; Tue, 11 Aug 2020 14:53:54 -0400 Original-Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:39187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k5ZPD-0001P3-8u for emacs-devel@gnu.org; Tue, 11 Aug 2020 14:53:53 -0400 Original-Received: by mail-qt1-x831.google.com with SMTP id w9so10231048qts.6 for ; Tue, 11 Aug 2020 11:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:cc:subject:date:message-id:mime-version; bh=/ly3QfAE+0qIbTJtGFSyLj+uQ35wufQG1Qi3LfrDbus=; b=eCBzjVPcSjQAHLPyp5obF/SSzkhQW1xpSkSHDVfnu68gpXMuqd9+OA28CO3GvtvKn2 YajoT06Espn2oF1PIKN2zLOqotgzPUj73+tyGqND0Fbsz9nR6EDDH7YgKUxgPBtE8GT7 /cDMbPvS49cNf5UO3kAuaO22A07srhw2U4Xd2E7dkTSqjDVc4iudsqNzAuH+wYrNAv1L u7BRKkQN/fxBhOO5mQcViJIsvd1wBvmNMmO8RSSVo09vhZi+ms4zXQfSKhadKh+AzJg1 4pI9seicn5GHmHi3lJugDbu0TmauHaI4LWwe61NUiLYPSNFcWA6crjUOAF9chlxBP+SN Kv7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:cc:subject:date:message-id :mime-version; bh=/ly3QfAE+0qIbTJtGFSyLj+uQ35wufQG1Qi3LfrDbus=; b=Lc/cilit/KnlQv5OR3isBWwywIHEGp6xsg0X0texV3x3bFO55y7jJaPlFq+7vDst1v yE9IBRiHUi0Jx0glXwdKOlf8Br36aFdtllKhuvD1Wjs3A8jShyZSz0cs4bS9F6EMWZEc j53eeCiy/w2/SGTgPln0Boox5iQOXRFnp+C9gN1ixCEz6H1VjJKUt0QHAVw9oRoWSCrE aSmeAWPekgVl3TrpApyFD+xhBTgHpIRb/n6D69M0/IFmqvIWgCNDOTdub6F/8piVTud+ DqreVp/dIi5w2w/atbttg6JiKo+RiC84E9hRb2znC8rOfGX7TDizVUPPAP68sJ+6npEi ZeBw== X-Gm-Message-State: AOAM5319W+0Hznm/0hF2T7m//mXmQdL5ahzTHlrWq5m135y5J+91c4w7 XldvlS3MFa1zI+/hZ6iHc/o= X-Google-Smtp-Source: ABdhPJyk7heNm0lI8RtW8dacnshnyhhmjQ0egKT2Q9RJggwxs7uZQVft3+VFUbbNnjjH0SBCPQVx+w== X-Received: by 2002:aed:3387:: with SMTP id v7mr2526045qtd.318.1597172029753; Tue, 11 Aug 2020 11:53:49 -0700 (PDT) Original-Received: from mt-manjaro (216-58-109-18.cpe.distributel.net. [216.58.109.18]) by smtp.gmail.com with ESMTPSA id q126sm17660656qkb.75.2020.08.11.11.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 11:53:49 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::831; envelope-from=matthewzmd@gmail.com; helo=mail-qt1-x831.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:253645 Archived-At: By the definition of erc-reuse-buffers, if non-nil it should create a new buffer when joining channels with same names on different servers. The current behavior of erc-reuse-buffers is: 1. when non-nil, it will always reuse the same channel buffer, resulting in server A's channel gets reconnected to the channel with the same name of server B. 2. when nil, the buffer-name of the joined channel is '#channel/server'. However if one tries to '/join #channel' from the server buffer, it creates a new empty buffer with buffer-name '#channel', instead of opening the already-joined channel buffer. This bug is partly documented in bug#40121. * lisp/erc/erc.el (erc-generate-new-buffer-name): fixes behavior 1, also determines if the '#channel/server' buffer already exists and will reuse that buffer when joining on the same server. Additionally when creating a new buffer with '#channel/serverB', the existing buffer '#channel' on 'severA' will be renamed to '#channel/serverA' for the sake of consistency. (erc-cmd-JOIN): with some refactoring, it ensures the joined channel buffer is selected and thereby fixes the second behavior. * lisp/erc/erc-join.el (erc-autojoin-channels): the logic is simplified ensuring that when autojoining channels specified in erc-autojoin-channels-alist, if there exists an erc buffer with the same channel name but a different server, it will create a new buffer to join the channel. The current logic is very weak that will skip joining same channel on different servers altogether. --- lisp/erc/erc-join.el | 22 ++++++------ lisp/erc/erc.el | 85 +++++++++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 46 deletions(-) diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index e4faf6bd79..79c111082f 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -153,18 +153,20 @@ This function is run from `erc-nickserv-identified-hook'." 'erc-autojoin-channels-delayed server nick (current-buffer)))) ;; `erc-autojoin-timing' is `connect': - (dolist (l erc-autojoin-channels-alist) - (when (string-match (car l) server) - (let ((server (or erc-session-server erc-server-announced-name))) + (let ((server (or erc-session-server erc-server-announced-name))) + (dolist (l erc-autojoin-channels-alist) + (when (string-match-p (car l) server) (dolist (chan (cdr l)) - (let ((buffer (erc-get-buffer chan))) - ;; Only auto-join the channels that we aren't already in - ;; using a different nick. + (let ((buffer + (car (erc-buffer-filter + (lambda () + (let ((current (erc-default-target))) + (and (stringp current) + (string-match-p (car l) + (or erc-session-server erc-server-announced-name)) + (string-equal (erc-downcase chan) + (erc-downcase current))))))))) (when (or (not buffer) - ;; If the same channel is joined on another - ;; server the best-effort is to just join - (not (string-match (car l) - (process-name erc-server-process))) (not (with-current-buffer buffer (erc-server-process-alive)))) (erc-server-join-channel server chan)))))))) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 404a4c0997..41d7516fbb 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1608,36 +1608,47 @@ symbol, it may have these values: (defun erc-generate-new-buffer-name (server port target) "Create a new buffer name based on the arguments." (when (numberp port) (setq port (number-to-string port))) - (let ((buf-name (or target - (or (let ((name (concat server ":" port))) - (when (> (length name) 1) - name)) - ;; This fallback should in fact never happen - "*erc-server-buffer*"))) - buffer-name) + (let* ((buf-name (or target + (let ((name (concat server ":" port))) + (when (> (length name) 1) + name)) + ;; This fallback should in fact never happen. + "*erc-server-buffer*")) + (full-buf-name (concat buf-name "/" server)) + (dup-buf-name (buffer-name (car (erc-channel-list nil)))) + buffer-name) ;; Reuse existing buffers, but not if the buffer is a connected server ;; buffer and not if its associated with a different server than the ;; current ERC buffer. - ;; if buf-name is taken by a different connection (or by something !erc) - ;; then see if "buf-name/server" meets the same criteria - (dolist (candidate (list buf-name (concat buf-name "/" server))) - (if (and (not buffer-name) - erc-reuse-buffers - (or (not (get-buffer candidate)) - ;; Looking for a server buffer, so there's no target. - (and (not target) - (with-current-buffer (get-buffer candidate) - (and (erc-server-buffer-p) - (not (erc-server-process-alive))))) - ;; Channel buffer; check that it's from the right server. - (and target - (with-current-buffer (get-buffer candidate) - (and (string= erc-session-server server) - (erc-port-equal erc-session-port port)))))) - (setq buffer-name candidate))) - ;; if buffer-name is unset, neither candidate worked out for us, + ;; If buf-name is taken by a different connection (or by something !erc) + ;; then see if "buf-name/server" meets the same criteria. + (if (and dup-buf-name (string-match-p (concat buf-name "/") dup-buf-name)) + (setq buffer-name full-buf-name) ; ERC buffer with full name already exists. + (dolist (candidate (list buf-name full-buf-name)) + (if (and (not buffer-name) + erc-reuse-buffers + (or (not (get-buffer candidate)) + ;; Looking for a server buffer, so there's no target. + (and (not target) + (with-current-buffer (get-buffer candidate) + (and (erc-server-buffer-p) + (not (erc-server-process-alive))))) + ;; Channel buffer; check that it's from the right server. + (and target + (with-current-buffer (get-buffer candidate) + (and (string= erc-session-server server) + (erc-port-equal erc-session-port port)))))) + (setq buffer-name candidate) + (when (and (not buffer-name) (get-buffer buf-name) erc-reuse-buffers) + ;; A new buffer will be created with the name buf-name/server, rename + ;; the existing name-duplicated buffer with the same format as well. + (with-current-buffer (get-buffer buf-name) + (when (derived-mode-p 'erc-mode) ; ensure it's an erc buffer + (rename-buffer + (concat buf-name "/" (or erc-session-server erc-server-announced-name))))))))) + ;; If buffer-name is unset, neither candidate worked out for us, ;; fallback to the old uniquification method: - (or buffer-name (generate-new-buffer-name (concat buf-name "/" server))))) + (or buffer-name (generate-new-buffer-name full-buf-name)))) (defun erc-get-buffer-create (server port target) "Create a new buffer based on the arguments." @@ -3153,16 +3164,18 @@ were most recently invited. See also `invitation'." (setq chnl (erc-ensure-channel-name channel))) (when chnl ;; Prevent double joining of same channel on same server. - (let ((joined-channels - (mapcar #'(lambda (chanbuf) - (with-current-buffer chanbuf (erc-default-target))) - (erc-channel-list erc-server-process)))) - (if (erc-member-ignore-case chnl joined-channels) - (switch-to-buffer (car (erc-member-ignore-case chnl - joined-channels))) - (let ((server (with-current-buffer (process-buffer erc-server-process) - (or erc-session-server erc-server-announced-name)))) - (erc-server-join-channel server chnl key)))))) + (let* ((joined-channels + (mapcar #'(lambda (chanbuf) + (with-current-buffer chanbuf (erc-default-target))) + (erc-channel-list erc-server-process))) + (server (with-current-buffer (process-buffer erc-server-process) + (or erc-session-server erc-server-announced-name))) + (chnl-name (car (erc-member-ignore-case chnl joined-channels)))) + (if chnl-name + (switch-to-buffer (if (get-buffer chnl-name) + chnl-name + (concat chnl-name "/" server))) + (erc-server-join-channel server chnl key))))) t) (defalias 'erc-cmd-CHANNEL 'erc-cmd-JOIN) -- 2.27.0