From f8e16324a038417f0180b76c77c60313c880e74c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Jadi?= Date: Mon, 30 Jun 2014 10:55:14 +0800 Subject: [PATCH] * net/rcirc.el (rcirc-buffer-process): Restore previous behaviour. Fixes: debbugs:17772 --- lisp/ChangeLog | 5 +++++ lisp/net/rcirc.el | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) 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 + + * net/rcirc.el (rcirc-buffer-process): Restore previous + behaviour. (Bug#17772) + 2014-06-29 Alan Mackenzie 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." -- 2.39.5