Mercurial > emacs
comparison lisp/desktop.el @ 80720:9cdccb5e49a8
Backport trivial fixes from the trunk.
* desktop.el (desktop-minor-mode-table): Add `savehist-mode'.
* play/solitaire.el (solitaire-solve): Err out if the solitaire
is already in progress.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 12 Aug 2008 22:23:30 +0000 |
| parents | b30a40e18121 |
| children |
comparison
equal
deleted
inserted
replaced
| 80719:0bd3bab4b7be | 80720:9cdccb5e49a8 |
|---|---|
| 452 'desktop-buffer-mode-handlers "22.1") | 452 'desktop-buffer-mode-handlers "22.1") |
| 453 | 453 |
| 454 (defcustom desktop-minor-mode-table | 454 (defcustom desktop-minor-mode-table |
| 455 '((auto-fill-function auto-fill-mode) | 455 '((auto-fill-function auto-fill-mode) |
| 456 (vc-mode nil) | 456 (vc-mode nil) |
| 457 (vc-dired-mode nil)) | 457 (vc-dired-mode nil) |
| 458 (savehist-mode nil)) | |
| 458 "Table mapping minor mode variables to minor mode functions. | 459 "Table mapping minor mode variables to minor mode functions. |
| 459 Each entry has the form (NAME RESTORE-FUNCTION). | 460 Each entry has the form (NAME RESTORE-FUNCTION). |
| 460 NAME is the name of the buffer-local variable indicating that the minor | 461 NAME is the name of the buffer-local variable indicating that the minor |
| 461 mode is active. RESTORE-FUNCTION is the function to activate the minor mode. | 462 mode is active. RESTORE-FUNCTION is the function to activate the minor mode. |
| 462 RESTORE-FUNCTION nil means don't try to restore the minor mode. | 463 RESTORE-FUNCTION nil means don't try to restore the minor mode. |