diff options
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc-track.el | 1 |
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 @@ | |||
| 1 | 2011-01-31 Antoine Levitt <antoine.levitt@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * erc-track.el (track): Don't reset erc-modified-channels-object | ||
| 4 | each time erc-track-mode is activated. | ||
| 5 | |||
| 1 | 2010-10-23 Julien Danjou <julien@danjou.info> | 6 | 2010-10-23 Julien Danjou <julien@danjou.info> |
| 2 | 7 | ||
| 3 | * erc-backend.el (erc-server-JOIN): Set the correct target list on join. | 8 | * 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." | |||
| 649 | (add-hook 'erc-send-completed-hook 'erc-user-is-active) | 649 | (add-hook 'erc-send-completed-hook 'erc-user-is-active) |
| 650 | (add-hook 'erc-server-001-functions 'erc-user-is-active)) | 650 | (add-hook 'erc-server-001-functions 'erc-user-is-active)) |
| 651 | (erc-track-add-to-mode-line erc-track-position-in-mode-line) | 651 | (erc-track-add-to-mode-line erc-track-position-in-mode-line) |
| 652 | (setq erc-modified-channels-object (erc-modified-channels-object nil)) | ||
| 653 | (erc-update-mode-line) | 652 | (erc-update-mode-line) |
| 654 | (if (featurep 'xemacs) | 653 | (if (featurep 'xemacs) |
| 655 | (defadvice switch-to-buffer (after erc-update (&rest args) activate) | 654 | (defadvice switch-to-buffer (after erc-update (&rest args) activate) |