* net/rcirc.el (rcirc-buffer-process): Restore previous behaviour.

Fixes: debbugs:17772

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f9084f4cbb0d6b0a114e482bffaee04d3fd1995..3e9e6f3ee270dd9e4f43d57f747f234a36aef548 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-30  Grégoire Jadi  <daimrod@gmail.com>
+
+       * net/rcirc.el (rcirc-buffer-process): Restore previous
+       behaviour.  (Bug#17772)
+
 2014-06-29  Alan Mackenzie  <acm@muc.de>
 
        Don't call c-parse-state when c++-template-syntax-table is active.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index a0e72d1a6f5a1855717577e5dde1516586dbc7dd..9f2b4bb85db7ac6f32995970a8cf6026fa0cd934 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -802,11 +802,11 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.")
 (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 (if (buffer-live-p rcirc-server-buffer)
-                              rcirc-server-buffer
-                            (error "Server buffer deleted")))))
-    (or (with-current-buffer buffer rcirc-process)
-       rcirc-process)))
+  (let ((buffer (or buffer (and (buffer-live-p rcirc-server-buffer)
+                               rcirc-server-buffer))))
+    (if buffer
+        (with-current-buffer buffer rcirc-process)
+      rcirc-process)))
 
 (defun rcirc-server-name (process)
   "Return PROCESS server name, given by the 001 response."