diff options
| author | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
| commit | 2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9 (patch) | |
| tree | 3711b97807201b7eeaa066003b1c3a4ce929e5bb /lisp/erc/erc-netsplit.el | |
| parent | e1d276cbf9e18f13101328f56bed1a1c0a66e63a (diff) | |
| parent | e7d0e5ee247a155a268ffbf80bedbe25e15b5032 (diff) | |
| download | emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.tar.gz emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.zip | |
Diffstat (limited to 'lisp/erc/erc-netsplit.el')
| -rw-r--r-- | lisp/erc/erc-netsplit.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el index fc4aeb10c84..cbaf62b1a61 100644 --- a/lisp/erc/erc-netsplit.el +++ b/lisp/erc/erc-netsplit.el | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | ;;; Code: | 31 | ;;; Code: |
| 32 | 32 | ||
| 33 | (require 'erc) | 33 | (require 'erc) |
| 34 | (eval-when-compile (require 'cl)) | ||
| 35 | 34 | ||
| 36 | (defgroup erc-netsplit nil | 35 | (defgroup erc-netsplit nil |
| 37 | "Netsplit detection tries to automatically figure when a | 36 | "Netsplit detection tries to automatically figure when a |
| @@ -107,7 +106,7 @@ join from that split has been detected or not.") | |||
| 107 | (dolist (elt erc-netsplit-list) | 106 | (dolist (elt erc-netsplit-list) |
| 108 | (if (member nick (nthcdr 3 elt)) | 107 | (if (member nick (nthcdr 3 elt)) |
| 109 | (progn | 108 | (progn |
| 110 | (if (not (caddr elt)) | 109 | (if (not (nth 2 elt)) |
| 111 | (progn | 110 | (progn |
| 112 | (erc-display-message | 111 | (erc-display-message |
| 113 | parsed 'notice (process-buffer proc) | 112 | parsed 'notice (process-buffer proc) |
| @@ -149,7 +148,7 @@ join from that split has been detected or not.") | |||
| 149 | ;; element for this netsplit exists already | 148 | ;; element for this netsplit exists already |
| 150 | (progn | 149 | (progn |
| 151 | (setcdr (nthcdr 2 ass) (cons nick (nthcdr 3 ass))) | 150 | (setcdr (nthcdr 2 ass) (cons nick (nthcdr 3 ass))) |
| 152 | (when (caddr ass) | 151 | (when (nth 2 ass) |
| 153 | ;; There was already a netjoin for this netsplit, it | 152 | ;; There was already a netjoin for this netsplit, it |
| 154 | ;; seems like the old one didn't get finished... | 153 | ;; seems like the old one didn't get finished... |
| 155 | (erc-display-message | 154 | (erc-display-message |
| @@ -194,7 +193,7 @@ join from that split has been detected or not.") | |||
| 194 | nil 'notice 'active | 193 | nil 'notice 'active |
| 195 | 'netsplit-wholeft ?s (car elt) | 194 | 'netsplit-wholeft ?s (car elt) |
| 196 | ?n (mapconcat 'erc-extract-nick (nthcdr 3 elt) " ") | 195 | ?n (mapconcat 'erc-extract-nick (nthcdr 3 elt) " ") |
| 197 | ?t (if (caddr elt) | 196 | ?t (if (nth 2 elt) |
| 198 | "(joining)" | 197 | "(joining)" |
| 199 | ""))))) | 198 | ""))))) |
| 200 | t) | 199 | t) |