summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-track.el1
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3326bf065a4..fb05e6f9d1f 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-31 Antoine Levitt <antoine.levitt@gmail.com> (tiny change)
+
+ * erc-track.el (track): Don't reset erc-modified-channels-object
+ each time erc-track-mode is activated.
+
2010-10-23 Julien Danjou <julien@danjou.info>
* erc-backend.el (erc-server-JOIN): Set the correct target list on join.
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index f07d963cfd8..b78880e86b4 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -649,7 +649,6 @@ module, otherwise the keybindings will not do anything useful."
(add-hook 'erc-send-completed-hook 'erc-user-is-active)
(add-hook 'erc-server-001-functions 'erc-user-is-active))
(erc-track-add-to-mode-line erc-track-position-in-mode-line)
- (setq erc-modified-channels-object (erc-modified-channels-object nil))
(erc-update-mode-line)
(if (featurep 'xemacs)
(defadvice switch-to-buffer (after erc-update (&rest args) activate)