From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#60191: [PATCH] Fix `rcirc-buffer-process' not working on channel buffers Date: Mon, 01 May 2023 12:05:09 +0000 Message-ID: <875y9cqmtm.fsf@posteo.net> References: <877cynrd8i.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="14491"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60191@debbugs.gnu.org To: Thuna Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon May 01 14:05:14 2023 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 1ptSHJ-0003Z4-Pn for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 01 May 2023 14:05:13 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptSHA-00037g-BH; Mon, 01 May 2023 08:05:04 -0400 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 1ptSH8-00037S-Su for bug-gnu-emacs@gnu.org; Mon, 01 May 2023 08:05:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptSH8-0005Rn-Ak for bug-gnu-emacs@gnu.org; Mon, 01 May 2023 08:05:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptSH8-0004OV-3t for bug-gnu-emacs@gnu.org; Mon, 01 May 2023 08:05:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 May 2023 12:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60191 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 60191-submit@debbugs.gnu.org id=B60191.168294268616858 (code B ref 60191); Mon, 01 May 2023 12:05:02 +0000 Original-Received: (at 60191) by debbugs.gnu.org; 1 May 2023 12:04:46 +0000 Original-Received: from localhost ([127.0.0.1]:39069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptSGr-0004No-Kc for submit@debbugs.gnu.org; Mon, 01 May 2023 08:04:45 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:58085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptSGo-0004NW-QL for 60191@debbugs.gnu.org; Mon, 01 May 2023 08:04:43 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 42C2C2401FA for <60191@debbugs.gnu.org>; Mon, 1 May 2023 14:04:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1682942677; bh=84IEz80YdE//LADqaEdbXgjoHyG0PY8ef7q58ewlPmw=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=YbRM1y1ZW4ZmAk8fzf5Y8a8kjUwrZ7aWJS177GXsLyUDCqw9isqev6H5hpDeJCohb p70JKP2fTt4RPTQj+qftBSr7O0VLQ3u7rtdzT7Td2DKwyKKLfJ4cv5Xbde9NR6UE3n IyC7f3cOpPWqdeqp/KE122wC/FrivddMU5wdSnb8O5bLyFNo8pfS5oL1JXNwlzmNhH cKNzbnSR3MYHPWdhCqZvKwUXAygNMAgUMWnobX2DXGADJs2NbBrTuNOLqM4wdo1tjb BZ9QXFn/xRA0b0qbGj6h5C7p+OAccxlMKwFR9CR79VggPlDACBbpimHjh0y17MMskN 4RjRUTpGPZRtA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Q922D63NYz6twp; Mon, 1 May 2023 14:04:36 +0200 (CEST) In-Reply-To: <877cynrd8i.fsf@gmail.com> (Thuna's message of "Mon, 19 Dec 2022 09:47:57 +0100") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM 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:260858 Archived-At: Thuna writes: > Currently `rcirc-buffer-process' with no BUFFER argument defaults to > current buffer's `rcirc-server-buffer' instead of the current buffer > itself which leads to `rcirc-buffer-process' not working with channel > buffers. I do not understand what you mean by "not working" here, the code appears to do the same thing pre- and post-patch, in the process and the channel buffers. > This patch should hopefully fix that. > >>>From d17e7cbb34cf83098561c57b383f90d6a7bde50e Mon Sep 17 00:00:00 2001 > From: Thuna > Date: Mon, 19 Dec 2022 09:33:29 +0100 > Subject: [PATCH] Fix `rcirc-buffer-process' not working on channel buffers > > * lisp/net/rcirc.el (rcirc-buffer-process): Look at BUFFER's > `rcirc-server-buffer's `rcirc-process' instead. Signal an error if it > has none. > --- > lisp/net/rcirc.el | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el > index 96109dcd5c9..7afb625407e 100644 > --- a/lisp/net/rcirc.el > +++ b/lisp/net/rcirc.el > @@ -1179,11 +1179,11 @@ rcirc-send-ctcp > (defun rcirc-buffer-process (&optional buffer) > "Return the process associated with channel BUFFER. > With no argument or nil as argument, use the current buffer." > - (let ((buffer (or buffer (and (buffer-live-p rcirc-server-buffer) > - rcirc-server-buffer)))) > - (if buffer > - (buffer-local-value 'rcirc-process buffer) > - rcirc-process))) > + (let ((buffer (or buffer (current-buffer)))) > + (buffer-local-value > + 'rcirc-process > + (or (buffer-local-value 'rcirc-server-buffer buffer) > + (error "Not an rcirc buffer: %S" buffer))))) > > (defun rcirc-server-name (process) > "Return PROCESS server name, given by the 001 response."