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: [PATCH] erc: fix erc-reuse-buffers (bug#40121) Date: Tue, 04 Aug 2020 22:30:44 -0400 Message-ID: <87lfitesdn.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="23572"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.4.12; emacs 27.0.91 Cc: bandali@gnu.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Aug 05 04:32:13 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 1k39Dx-000611-4I for ged-emacs-devel@m.gmane-mx.org; Wed, 05 Aug 2020 04:32:13 +0200 Original-Received: from localhost ([::1]:48564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k39Dw-0003wj-5X for ged-emacs-devel@m.gmane-mx.org; Tue, 04 Aug 2020 22:32:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k39Cd-0002dv-7p for emacs-devel@gnu.org; Tue, 04 Aug 2020 22:30:51 -0400 Original-Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:33710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k39Cb-0002jT-2D; Tue, 04 Aug 2020 22:30:50 -0400 Original-Received: by mail-qt1-x841.google.com with SMTP id 6so32661728qtt.0; Tue, 04 Aug 2020 19:30:48 -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=cz5nYX+1eCEopznY3UgQRG0ElOtO0fEgoCG5iroVRw4=; b=amHUIqWtujS20Cuav9Pwu1pOFFahnC4XCv4Lt2HjScBmMCmksgZJY0saCI7dawu1M1 Hyh+Nt2uzDBepKTKe1Ta0GNbAAFdJsj7DqOya9zuYFMg+RZhMECap2slXVTWG9ogI2qU 4DbLUy5uih0nnsi0FR2Zh6IgPR3SCEu6CTOPuQAfzuLmKBj6XDVUrK3qysD6wwCeiaXI 8sVNXQFs4U0puwqkjef1FNcbsgbJJ0c3cmVuP2Us7muOXhg218HM2C8eMm8dcpUf0isQ 0a/X4m5/sxP68Z8DkDz+Rx/HXkeyD4HPw4mD4ymGXAqvwipZ48IIFW4hJnY0L4qBVNB4 RHEA== 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=cz5nYX+1eCEopznY3UgQRG0ElOtO0fEgoCG5iroVRw4=; b=sn9SEccCCcfxLrdbkF5pQ5u5D5MpkQuYP3GiBEZjVxQfno+0VZgukcSSf6RYS3we/g 2p4Wa2OmB5pOX5q6jLfD1EPMtlxf1JItRPoz8KQz9u2OSSKdJIVh/2wCKbxPE5NSM1CJ iZKPr2RxeEnxB4Lohk9gY145dH8ih2UfU5Lrej9gDtXvvss9CQhCCapdC78ZCsuvFswI 7yqnih7JhxHJKVgqJnULXVBAcFBanmbev/mTkIwCj7r0Ii9Tz8uzW0BF+EO1r+2WKIuW 39tel4togWuIRzR0oD+yWxiQDMuKslwN2SDKw4DqjvDLzr0Fk3ut2uDCKs7JGRbjAtyD MB0A== X-Gm-Message-State: AOAM531nIP1CdTRFdZ6F9HkZVbG44Nsy+B2A0rD8g0fVGLubCADVfK/w vlSjrVyHi5E4PmGuyQuStW49Qofbnrg= X-Google-Smtp-Source: ABdhPJyPPCgi45fMTxVKaUHnev7HQAbZLh4KA8x4j1h8TxAKF5j0CclXDtKmdhb/SUxG0O7JHzxQig== X-Received: by 2002:ac8:6c49:: with SMTP id z9mr1197163qtu.110.1596594646889; Tue, 04 Aug 2020 19:30:46 -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 l66sm507396qkd.62.2020.08.04.19.30.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 19:30:46 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::841; envelope-from=matthewzmd@gmail.com; helo=mail-qt1-x841.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:253456 Archived-At: By 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): since `target' is always non-nil, buffer-name is non-nil, erc-reuse-buffers is t, it will always use the first candidate, resulting in behavior 1. This is now fixed, and both channel buffers with the same name will be formated '#channel/serverA' and '#channel/serverB' 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 | 83 +++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 45 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 8830dd4c45..dbe19aa704 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1606,35 +1606,46 @@ 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. - (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. + (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." @@ -3099,16 +3110,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