Subject: bug#60191: [PATCH] Fix `rcirc-buffer-process' not working on channel buffers

From: Philip Kaludercic <[email-masked]>
Date: Mon, 01 May 2023 12:05:09 +0000

Thuna <[email-masked]> 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 <[email-masked]>
> 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."