diff options
| author | Michael Olson <mwolson@gnu.org> | 2007-10-30 00:50:07 +0000 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2007-10-30 00:50:07 +0000 |
| commit | f2168a4cda83e9e3489e3cb96e7764884c4029e1 (patch) | |
| tree | 20f793e6b6653d071f36bbd3cbb660dcd1c49960 /lisp/erc | |
| parent | 9838952aba38495fd451cdbf819ef1ff47264fe8 (diff) | |
| download | emacs-f2168a4cda83e9e3489e3cb96e7764884c4029e1.tar.gz | |
Revert bad erc-track change; ignore erc-track-minor-mode properly in desktop
* lisp/desktop.el (desktop-minor-mode-table): Add line for ERC.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-track.el | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 0867cb8de2f..1cd1edb65eb 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -3,10 +3,6 @@ * erc-ibuffer.el (erc-modified-channels-alist): Use eval-when-compile, and explain why we are doing this. - * erc-track.el: Make sure that the state of erc-track-minor-mode - is not preserved when using desktop.el. Thanks to Levin for the - report. - 2007-10-25 Dan Nicolaescu <dann@ics.uci.edu> * erc-ibuffer.el (erc-modified-channels-alist): Pacify diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index 61d56c94ca7..ad3eaf73a4b 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -560,8 +560,6 @@ module, otherwise the keybindings will not do anything useful." :global t :group 'erc-track) -(add-to-list 'desktop-minor-mode-table '(erc-track-minor-mode nil)) - (defun erc-track-minor-mode-maybe () "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'." (unless (or erc-track-minor-mode |