From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Thuna Newsgroups: gmane.emacs.bugs Subject: bug#60191: [PATCH] Fix `rcirc-buffer-process' not working on channel buffers Date: Mon, 19 Dec 2022 09:47:57 +0100 Message-ID: <877cynrd8i.fsf@gmail.com> 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="28599"; mail-complaints-to="usenet@ciao.gmane.io" To: 60191@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 19 09:49:46 2022 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 1p7BqE-0007Bm-3u for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Dec 2022 09:49:46 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Bpu-0006RO-2T; Mon, 19 Dec 2022 03:49:26 -0500 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 1p7BpY-0006KV-5Q for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 03:49:07 -0500 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 1p7BpW-0008Na-UD for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 03:49:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7BpW-0002NV-BE for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 03:49:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Thuna Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Dec 2022 08:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60191 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16714396909108 (code B ref -1); Mon, 19 Dec 2022 08:49:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 19 Dec 2022 08:48:10 +0000 Original-Received: from localhost ([127.0.0.1]:38077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Bog-0002Mp-BA for submit@debbugs.gnu.org; Mon, 19 Dec 2022 03:48:10 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:47974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Bof-0002Me-Cq for submit@debbugs.gnu.org; Mon, 19 Dec 2022 03:48:09 -0500 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 1p7Bob-0006CV-OB for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 03:48:08 -0500 Original-Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7BoX-0008Iq-NM for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 03:48:04 -0500 Original-Received: by mail-ej1-x62e.google.com with SMTP id x22so19714941ejs.11 for ; Mon, 19 Dec 2022 00:48:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=QfVv0fXnVrKtAj/0TeoFu19C12NweMqj2jxXDOrMInY=; b=b3T5omFfOaW+tl53TZy6ViLBSTt3PwfYT4ii7SYQCHU7z9zmyo1A6y9XCSPwxS/6Rn j+hFglsVzX98nU8vLr0h9ws7qPgYC7+QH2sIr7Qv7S7V1SESKzoHCZVmvLBnnlojDccc nSSR3veLSnpXRd8h35+bmwcEv/Q4O9j0xHplNh301+Bl1/4RSnSVsnhlqBixZWXeWBVW hLT1H+I+O8pXjDXKxBVGl3h/cj+3q97zxLKsMV5u6xjcUMOwAsKquQA5IHnsHAuDSzYm Bd72RJubYuGEE77DJusVjArGQg3KR22JhJidO2rqWJY2loFT34c08njcJu8I+9ornuNV B7iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QfVv0fXnVrKtAj/0TeoFu19C12NweMqj2jxXDOrMInY=; b=T5a2/R53l/i7rzojB6CXueIkfpIsmuUa1eENeGAEBNsuuU2DQzvG3F7T1GHFvjocbQ kazu7ck+Uyl/yUGxk8zqP+zio2T3mVKmxkhthjSUpJmBcsqznUszB9UoHYyWdyhpdfNY rHgFY21ETF+v30JWWRkeHtsRL4oF1UI+mGceQwK1zNGwkhLltG8+F3ildizMdvf4xpaS XVvAitp1sXnXu64Mb46gG97uPaYMpnThZ0zwGf+zyi/YW77YziA8jY85Vow0yEPNsbRC GwXdE4BAJiIYy7jHO/P+P03UIJMXSTrR46G9LTxMZAZRkm+vYr6xNFsUpmpZsUlRWjjM Xzcw== X-Gm-Message-State: ANoB5plh4tezFY72RP8UlyWSquMZZJb/vBs8q4FDS19CFyNeFUMhMcJT 8TstTKqH6V6BMLeVamGqRcgXCO6zYgA= X-Google-Smtp-Source: AA0mqf7wleXgujqFfkd1lgUa6TOL0DjjUijqE2RChOw0pd8xkWWgDEkiDcMl7DyVXEX+jHKDZxdFvw== X-Received: by 2002:a17:906:4dc9:b0:7c1:6fc:6048 with SMTP id f9-20020a1709064dc900b007c106fc6048mr35592992ejw.24.1671439679559; Mon, 19 Dec 2022 00:47:59 -0800 (PST) Original-Received: from thuna (eduroam-085.unibocconi.it. [90.147.70.85]) by smtp.gmail.com with ESMTPSA id s9-20020a170906bc4900b007c0e6d6bd10sm4115219ejv.132.2022.12.19.00.47.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Dec 2022 00:47:59 -0800 (PST) Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=thuna.cing@gmail.com; helo=mail-ej1-x62e.google.com 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: 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:251403 Archived-At: --=-=-= Content-Type: text/plain 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. This patch should hopefully fix that. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-rcirc-buffer-process-not-working-on-channel-buff.patch Content-Description: The patch >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." -- 2.37.4 --=-=-=--