From: John Wiegley <johnw@newartisans.com>
Date: Sun, 27 Mar 2016 00:22:03 +0000 (-0700)
Subject: Restore the fix to bug#18527 from commit d6868025
X-Git-Tag: emacs-26.0.90~2283
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=efb1883244f551cfb43fa9d85e3df8cc334fb232;p=emacs.git

Restore the fix to bug#18527 from commit d6868025
---

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index b413ee5a547..46e6d89ba5b 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -648,7 +648,6 @@ EVENT is the message received from the closed connection process."
   (or erc-server-reconnecting
       (and erc-server-auto-reconnect
            (not erc-server-banned)
-           (not erc-server-error-occurred)
            ;; make sure we don't infinitely try to reconnect, unless the
            ;; user wants that
            (or (eq erc-server-reconnect-attempts t)