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

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

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):

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

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

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