Sync from upstream ERC

 - Parse 307 (nick has identified) responses.
 - Only activate some things if the connection has been established.

1 files changed, 8 insertions, 7 deletions

diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 83bc0dffc0c..b20b7ad738b 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -173,13 +173,14 @@ join from that split has been detected or not.")
 
 (defun erc-netsplit-timer (now)
   "Clean cruft from `erc-netsplit-list' older than 10 minutes."
-  (dolist (elt erc-netsplit-list)
-    (when (> (erc-time-diff (cadr elt) now) 600)
-      (when erc-netsplit-debug
-        (erc-display-message
-         nil 'notice (current-buffer)
-         (concat "Netsplit: Removing " (car elt))))
-      (setq erc-netsplit-list (delq elt erc-netsplit-list)))))
+  (when erc-server-connected
+    (dolist (elt erc-netsplit-list)
+      (when (> (erc-time-diff (cadr elt) now) 600)
+        (when erc-netsplit-debug
+          (erc-display-message
+           nil 'notice (current-buffer)
+           (concat "Netsplit: Removing " (car elt))))
+        (setq erc-netsplit-list (delq elt erc-netsplit-list))))))
 
 ;;;###autoload
 (defun erc-cmd-WHOLEFT ()