diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-31 18:54:50 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-31 18:54:50 -0500 |
| commit | 14beddf4711854b01d400f36166dc71eb39435bb (patch) | |
| tree | 04fd96bb0f5dcf5f3aa4e9f39a537edc61038f83 /lisp/erc/erc-track.el | |
| parent | 2a4466ca2001c29fd654420b081b780981333dc5 (diff) | |
| parent | 113ef437f21c6ea1b65abe668feb86f1622a9f2e (diff) | |
| download | emacs-14beddf4711854b01d400f36166dc71eb39435bb.tar.gz emacs-14beddf4711854b01d400f36166dc71eb39435bb.tar.bz2 emacs-14beddf4711854b01d400f36166dc71eb39435bb.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/erc/erc-track.el')
| -rw-r--r-- | lisp/erc/erc-track.el | 1 |
1 files changed, 0 insertions, 1 deletions
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) |