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.  (Bug#60191)

(cherry picked from commit fb90e21af1b05d8cdeac9ae62b03b76ae9c74ae0)

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index a7b7fb25c7f2c51df72ab8023854f6b5d7e32f2a..b9970ea573ac0d385a5457aa8396d7bb2c7873e0 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1173,11 +1173,11 @@ element in PARTS is a list, append it to PARTS."
 (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."