diff options
| author | John Wiegley | 2016-03-26 17:22:03 -0700 |
|---|---|---|
| committer | John Wiegley | 2016-03-26 17:22:03 -0700 |
| commit | efb1883244f551cfb43fa9d85e3df8cc334fb232 (patch) | |
| tree | 5c05eb8b0ea4c24f30317315b18289fd47b4c71c | |
| parent | cad9d76e12a32c5ca752ce0cfd521a6faa29067b (diff) | |
| download | emacs-efb1883244f551cfb43fa9d85e3df8cc334fb232.tar.gz emacs-efb1883244f551cfb43fa9d85e3df8cc334fb232.zip | |
Restore the fix to bug#18527 from commit d6868025
| -rw-r--r-- | lisp/erc/erc-backend.el | 1 |
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." | |||
| 648 | (or erc-server-reconnecting | 648 | (or erc-server-reconnecting |
| 649 | (and erc-server-auto-reconnect | 649 | (and erc-server-auto-reconnect |
| 650 | (not erc-server-banned) | 650 | (not erc-server-banned) |
| 651 | (not erc-server-error-occurred) | ||
| 652 | ;; make sure we don't infinitely try to reconnect, unless the | 651 | ;; make sure we don't infinitely try to reconnect, unless the |
| 653 | ;; user wants that | 652 | ;; user wants that |
| 654 | (or (eq erc-server-reconnect-attempts t) | 653 | (or (eq erc-server-reconnect-attempts t) |