Merge changes from emacs-23 branch

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 879dd228562..ee81bc48693 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.
+
 2011-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * erc.el (erc-mode):
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index b15cdb023a6..de920eb9c33 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -648,7 +648,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)