From: Grégoire Jadi <daimrod@gmail.com>
Date: Mon, 30 Jun 2014 02:55:14 +0000 (+0800)
Subject: * net/rcirc.el (rcirc-buffer-process): Restore previous behaviour.
X-Git-Tag: emacs-25.0.90~2636^2~74^2~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8e16324a038417f0180b76c77c60313c880e74c;p=emacs.git

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

Fixes: debbugs:17772
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f9084f4cbb..3e9e6f3ee27 100644
--- 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 a0e72d1a6f5..9f2b4bb85db 100644
--- 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."