]> git.eshelyaron.com Git - emacs.git/commitdiff
Restore the fix to bug#18527 from commit d6868025
authorJohn Wiegley <johnw@newartisans.com>
Sun, 27 Mar 2016 00:22:03 +0000 (17:22 -0700)
committerJohn Wiegley <johnw@newartisans.com>
Sun, 27 Mar 2016 00:22:03 +0000 (17:22 -0700)
lisp/erc/erc-backend.el

index b413ee5a5477a62ae011037e70b9bcda248545d4..46e6d89ba5b101068856b5c49aef32b1149e3093 100644 (file)
@@ -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)