From: David Edmondson <dme@dme.org>
Date: Sun, 27 Dec 2015 20:33:01 +0000 (+0100)
Subject: Proxy error in erc with multiple clients
X-Git-Tag: emacs-25.0.90~346
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af25edebbcb33e788a0f4f9619787417aa0834b8;p=emacs.git

Proxy error in erc with multiple clients

* lisp/erc/erc.el (erc-channel-receive-names): Fix errors
generated when multiple IRC clients talk to a single IRC proxy
(bug#19034).

Backport:

(cherry picked from commit 507e98a54d1aa37823c64993d6b59257a82fe8f4)
---

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 04e99c7b884..2b22bd55ccc 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4826,6 +4826,11 @@ channel."
 			(_ (error "Unknown prefix char `%S'" ch) voice))
 		      'on)))
           (when updatep
+	    ;; If we didn't issue the NAMES request (consider two clients
+	    ;; talking to an IRC proxy), `erc-channel-begin-receiving-names'
+	    ;; will not have been called, so we have to do it here.
+	    (unless erc-channel-new-member-names
+	      (erc-channel-begin-receiving-names))
             (puthash (erc-downcase name) t
                      erc-channel-new-member-names)
             (erc-update-current-channel-member