From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Kevin Brubeck Unhammer Newsgroups: gmane.emacs.bugs Subject: bug#32723: [PATCH] Fix erc-autojoin for same channel names on multiple servers Date: Sun, 10 May 2020 21:45:54 +0200 Message-ID: <87zhaffua5.fsf@fsfe.org> References: <1ea700cd1f4f6a80dd1315c8192361bd09d1eadd.1536767069.git.nert.pinx@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="27902"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 32723@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun May 10 21:47:11 2020 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 1jXrup-00078A-9X for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 10 May 2020 21:47:11 +0200 Original-Received: from localhost ([::1]:55856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXruo-0008N4-BH for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 10 May 2020 15:47:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXrug-0008Mi-2U for bug-gnu-emacs@gnu.org; Sun, 10 May 2020 15:47:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXruf-0000gk-Ov for bug-gnu-emacs@gnu.org; Sun, 10 May 2020 15:47:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXruf-00054J-ND for bug-gnu-emacs@gnu.org; Sun, 10 May 2020 15:47:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Kevin Brubeck Unhammer Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 10 May 2020 19:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32723 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch fixed Original-Received: via spool by 32723-submit@debbugs.gnu.org id=B32723.158913996419391 (code B ref 32723); Sun, 10 May 2020 19:47:01 +0000 Original-Received: (at 32723) by debbugs.gnu.org; 10 May 2020 19:46:04 +0000 Original-Received: from localhost ([127.0.0.1]:50477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXrtk-00052h-1Z for submit@debbugs.gnu.org; Sun, 10 May 2020 15:46:04 -0400 Original-Received: from forward1-smtp.messagingengine.com ([66.111.4.223]:43927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXrti-00051V-Cq for 32723@debbugs.gnu.org; Sun, 10 May 2020 15:46:02 -0400 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailforward.nyi.internal (Postfix) with ESMTP id 437251941535; Sun, 10 May 2020 15:45:57 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 10 May 2020 15:45:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=2hbqrp S97bSdPUbqgRjnVcYAA+wtbbJ195Nh/l9R+go=; b=d35+woI1R3qYoj9sMUwsh2 AMK9LaR1+d5/B51EY3xqeZoYaOEf8S1+dvglz7PkhzoiDS7dh2hHALs1wtfkDvom PiKM3iYhIQy41kRBOUEJgtOVuRnm1GYZkc0JEeBe9obAJgilQ9u3mYmyfCt58vO6 WJ+C9SQ/mfvl3HRYBU2h2nnoi6ZOlsguYqYzf+yQNR3wtHuh1M6QE18Lnt0cRenZ siEiXhd0g6UKb9501ITXrOP068RtwBIMuXrd8Os+LRiJwyOy9LB80KxTgdmO0MY4 HsK5/mfbGx7R1A4UhMHWOiN/Conmsrfm4yY8TXUUGYghIJMq9gjJCtVH8CS48pjw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrkeekgddugeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenuchmihhsshhinhhgucfvqfcufhhivghlugculdeftd dmnecujfgurhephffujghffffkgggtsehgtderredttdejnecuhfhrohhmpefmvghvihhn uceurhhusggvtghkucgfnhhhrghmmhgvrhcuoehunhhhrghmmhgvrhesfhhsfhgvrdhorh hgqeenucggtffrrghtthgvrhhnpefgjeeggefhteeujeejfedtffeivdevueetgeejudei heetfeejteeuheethfevteenucffohhmrghinhepvgigrghmphhlvgdrtghomhdpvghrtg dqvgigrghmphhlvgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehunhhhrghmmhgvrhesfhhsfhgvrdhorhhg X-ME-Proxy: In-Reply-To: <1ea700cd1f4f6a80dd1315c8192361bd09d1eadd.1536767069.git.nert.pinx@gmail.com> (Martin Kletzander's message of "Wed, 12 Sep 2018 17:44:29 +0200") 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:180028 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Martin Kletzander =C4=8D=C3=A1lii: > When auto-joining channel with the same name on > multiple channels the auto-join will go over the > list of channels and for each one it checks if > there is a buffer and alive server process. > However it does not check if the server process > matches the server being currently processed for > auto-joining. > > This happens since commit "Don't join erc channels > doubly" > > Fix it by checking if the currently processed > server matches the erc process name of the already > joined channel. That's not always going to match though. The car's of erc-autojoin-channels contain the values of erc-server-announced-name or erc-session-server, not the process-name of erc-server-process. E.g. when I join my weechat relay, erc-session-server is "example.com" and erc-server-announced-name is "weechat.relay.irc" while (process-name erc-server-process) is "erc-example.com-9001<1>". Also, the check is against the current erc-server-process (for the server being joined). Isn't the intention of the patch to check against the candidate buffer's server-process? I would expect something like (when (or (not buffer) ;; If the same channel is joined on another ;; server the best-effort is to just join (not (with-current-buffer buffer (or (string-match-p (car l) erc-session-serv= er) (string-match-p (car l) erc-session-anno= unced-name)))) (not (with-current-buffer buffer (erc-server-process-alive)))) (erc-server-join-channel server chan)) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEq9A0PxCu5rIo7lbX/DwefQCTFmcFAl64WfIACgkQ/DwefQCT FmckcA/+NpOiRjvgkmEcUUjtkke/0Tl3siLxjSRrtq8PdfXha95h+82/xpG+S7+D o6AzL13B/AdkEJrTldWSsXExOyQGrmKf0iWkDQtkKjzUXBucbJJAgjidpwmWhdwU EO6aLiHPHqrrUumsEyzF+ui2obpAeOwnciKNOSeGBITni/ldeH5HshKI1NL46hHZ pXU2HRLpv0rxksf38VgM1lqkq4NtgFzN7/x7zmtLjMaN41WtBMc60slZ/QDLsV2O CKCn9WNBBW3HgAawiQFa3S8euroL/NhnWEEwHvP2f04n6s3JJpdQaJbg0uNFhLhB EMWEQFGjjihHmz3agfAvEnlyYr1lqtRmI+56JAVA1UmJZ95RmoI0/AxgVTF9kCDY 8KBE77+NMqljuH9vG8g+KVQPDvFB469b3N+uHkHjPrHuTdLvZ3rKQ2a9B5tjn56N NZZTrlx3vNyB7M8H2QdM7B/cAUBB2TwIFZQ+J7wZ9yo7lY/9eKQDANBpMcMx83y7 v7P7Tgu83/7HKSbHat2NpZmHc3bmJjE0Rj5EqXqjOHUQHJ/E4G/7RUX88iuHEq8t WLVgORazJZqbOPdCp7EZ2aDlzEnLoG5lyyL7v3BT1k0Dpz+GVtwf4ZteN3GT2gf1 jC58yyNaRKvhBCuJyuaMa3PcopJr8qksFPvvPv0tP3pEHEzC7ZU= =supr -----END PGP SIGNATURE----- --=-=-=--