summaryrefslogtreecommitdiff
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2007-10-30 00:50:07 +0000
committerMichael Olson <mwolson@gnu.org>2007-10-30 00:50:07 +0000
commitf2168a4cda83e9e3489e3cb96e7764884c4029e1 (patch)
tree20f793e6b6653d071f36bbd3cbb660dcd1c49960 /lisp/desktop.el
parent9838952aba38495fd451cdbf819ef1ff47264fe8 (diff)
downloademacs-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/desktop.el')
-rw-r--r--lisp/desktop.el3
1 files changed, 2 insertions, 1 deletions
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