Mercurial > emacs
comparison lisp/erc/erc-track.el @ 85771:a7aa5ee6bc3a
Revert bad erc-track change; ignore erc-track-minor-mode properly in desktop
* lisp/desktop.el (desktop-minor-mode-table): Add line for ERC.
| author | Michael Olson <mwolson@gnu.org> |
|---|---|
| date | Tue, 30 Oct 2007 00:50:07 +0000 |
| parents | 763be5e829a7 |
| children | 11b4896b439a |
comparison
equal
deleted
inserted
replaced
| 85770:d432c3fad643 | 85771:a7aa5ee6bc3a |
|---|---|
| 558 :lighter "" | 558 :lighter "" |
| 559 :keymap erc-track-minor-mode-map | 559 :keymap erc-track-minor-mode-map |
| 560 :global t | 560 :global t |
| 561 :group 'erc-track) | 561 :group 'erc-track) |
| 562 | 562 |
| 563 (add-to-list 'desktop-minor-mode-table '(erc-track-minor-mode nil)) | |
| 564 | |
| 565 (defun erc-track-minor-mode-maybe () | 563 (defun erc-track-minor-mode-maybe () |
| 566 "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'." | 564 "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'." |
| 567 (unless (or erc-track-minor-mode | 565 (unless (or erc-track-minor-mode |
| 568 ;; don't start the minor mode until we have an ERC | 566 ;; don't start the minor mode until we have an ERC |
| 569 ;; process running, because we don't want to prompt the | 567 ;; process running, because we don't want to prompt the |