[Erc-commit] [commit][master] Revert "erc-track: Fix buggy interaction with desktop.el"

[mwolson]

commit aa1f9a9f82fc10781e22b2c70409aa2dce566d5f
Author: Michael W. Olson <address@hidden>
Date:   Mon Oct 29 20:43:44 2007 -0400

    Revert "erc-track: Fix buggy interaction with desktop.el"
    
    It was causing problems with non-desktop users.  People should just do
    this workaround in their own config.
    
    This reverts commit a4c556486d31d946e6d4d485838fd528c122ee4a.

diff --git a/ChangeLog b/ChangeLog
index dac0b51..24e7e71 100644
--- a/ChangeLog
+++ b/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  <address@hidden>
 
        * erc-ibuffer.el (erc-modified-channels-alist): Pacify
diff --git a/erc-track.el b/erc-track.el
index 61d56c9..ad3eaf7 100644
--- a/erc-track.el
+++ b/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