aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc/erc-notify.el
diff options
context:
space:
mode:
authorMichael Olson2007-11-29 22:36:38 +0000
committerMichael Olson2007-11-29 22:36:38 +0000
commit2131c501dd40482c6c30b538eecfc7e9ab4e58d2 (patch)
tree861f8992c4737997bd3470d7c7748fe369798d15 /lisp/erc/erc-notify.el
parentb510360c6bf66da86512b837c9533cbd24b776fe (diff)
downloademacs-2131c501dd40482c6c30b538eecfc7e9ab4e58d2.tar.gz
emacs-2131c501dd40482c6c30b538eecfc7e9ab4e58d2.zip
Sync from upstream ERC
- Parse 307 (nick has identified) responses. - Only activate some things if the connection has been established.
Diffstat (limited to 'lisp/erc/erc-notify.el')
-rw-r--r--lisp/erc/erc-notify.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 9216631a9b4..34556a00d6c 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -111,7 +111,8 @@ changes."
111;;;; Timer handler 111;;;; Timer handler
112 112
113(defun erc-notify-timer (now) 113(defun erc-notify-timer (now)
114 (when (and erc-notify-list 114 (when (and erc-server-connected
115 erc-notify-list
115 (> (erc-time-diff 116 (> (erc-time-diff
116 erc-last-ison-time now) 117 erc-last-ison-time now)
117 erc-notify-interval)) 118 erc-notify-interval))