Revert bad erc-track change; ignore erc-track-minor-mode properly in desktop

* lisp/desktop.el (desktop-minor-mode-table): Add line for ERC.

4 files changed, 6 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0299bb9b2f6..79cffa6e39a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-30  Michael Olson  <mwolson@gnu.org>
+
+        * desktop.el (desktop-minor-mode-table): Add line for ERC.
+
 2007-10-29  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * allout.el (allout-command-prefix, allout-inhibit-auto-fill):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 0fa38ed3c91..040688492a4 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -454,7 +454,8 @@ Furthermore the major mode function must be autoloaded.")
 (defcustom desktop-minor-mode-table
   '((auto-fill-function auto-fill-mode)
     (vc-mode nil)
-    (vc-dired-mode nil))
+    (vc-dired-mode nil)
+    (erc-track-minor-mode nil))
   "Table mapping minor mode variables to minor mode functions.
 Each entry has the form (NAME RESTORE-FUNCTION).
 NAME is the name of the buffer-local variable indicating that the minor
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