summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-track.el
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2007-11-29 22:36:38 +0000
committerMichael Olson <mwolson@gnu.org>2007-11-29 22:36:38 +0000
commit2131c501dd40482c6c30b538eecfc7e9ab4e58d2 (patch)
tree861f8992c4737997bd3470d7c7748fe369798d15 /lisp/erc/erc-track.el
parentb510360c6bf66da86512b837c9533cbd24b776fe (diff)
downloademacs-2131c501dd40482c6c30b538eecfc7e9ab4e58d2.tar.gz
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-track.el')
-rw-r--r--lisp/erc/erc-track.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index ad3eaf73a4b..15de2094214 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -665,8 +665,9 @@ only consider active buffers visible.")
(defun erc-user-is-active (&rest ignore)
"Set `erc-buffer-activity'."
- (setq erc-buffer-activity (erc-current-time))
- (erc-track-modified-channels))
+ (when erc-server-connected
+ (setq erc-buffer-activity (erc-current-time))
+ (erc-track-modified-channels)))
(defun erc-track-get-buffer-window (buffer frame-param)
(if (eq frame-param 'selected-visible)