[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d50b89d 2/3: Further erc asynch fixes
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master d50b89d 2/3: Further erc asynch fixes |
Date: |
Sun, 27 Dec 2015 22:33:19 +0000 |
branch: master
commit d50b89dda9478b5e7e20e9b23bf48bd07ee6210a
Author: Thomas Riccardi <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Further erc asynch fixes
* lisp/erc/erc-backend.el (erc-process-sentinel-2): Make
erc-server-connect to return even if the connection is not
ready. Then erc-open and erc-server-reconnect do the
same. (bug#5650).
Copyright-paperwork-exempt: yes
---
lisp/erc/erc-backend.el | 8 +++-----
lisp/erc/erc.el | 1 +
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index a0b3537..fbac849 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -640,13 +640,11 @@ EVENT is the message received from the closed connection
process."
(condition-case err
(progn
(setq erc-server-reconnecting nil)
- (erc-server-reconnect)
- (setq erc-server-reconnect-count 0))
+ (setq erc-server-reconnect-count (1+
erc-server-reconnect-count))
+ (erc-server-reconnect))
(error (when (buffer-live-p buffer)
(set-buffer buffer)
- (if (integerp erc-server-reconnect-attempts)
- (setq erc-server-reconnect-count
- (1+ erc-server-reconnect-count))
+ (unless (integerp erc-server-reconnect-attempts)
(message "%s ... %s"
"Reconnecting until we succeed"
"kill the ERC server buffer to stop"))
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 126cac6..cd8e427 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4488,6 +4488,7 @@ Set user modes and run `erc-after-connect' hook."
(nick (car (erc-response.command-args parsed)))
(buffer (process-buffer proc)))
(setq erc-server-connected t)
+ (setq erc-server-reconnect-count 0)
(erc-update-mode-line)
(erc-set-initial-user-mode nick buffer)
(erc-server-setup-periodical-ping buffer)