summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-03-26 17:22:03 -0700
committerJohn Wiegley <johnw@newartisans.com>2016-03-26 17:22:03 -0700
commitefb1883244f551cfb43fa9d85e3df8cc334fb232 (patch)
tree5c05eb8b0ea4c24f30317315b18289fd47b4c71c /lisp/erc
parentcad9d76e12a32c5ca752ce0cfd521a6faa29067b (diff)
downloademacs-efb1883244f551cfb43fa9d85e3df8cc334fb232.tar.gz
Restore the fix to bug#18527 from commit d6868025
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc-backend.el1
1 files changed, 0 insertions, 1 deletions
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)