diff options
| author | Miles Bader <miles@gnu.org> | 2007-06-11 00:58:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-06-11 00:58:11 +0000 |
| commit | fb9a13e3dca1685b81fcf4d345133fb34911594d (patch) | |
| tree | 181797239f450c33ca8fd0d4d18686bbfc68859d /lisp/desktop.el | |
| parent | 4d3e23e3e8273e820d69e0ecca0f409c4b9a179e (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-fb9a13e3dca1685b81fcf4d345133fb34911594d.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 31de08bdc26..76fcb8a519f 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -423,7 +423,7 @@ Furthermore the major mode function must be autoloaded.") Each entry has the form (NAME RESTORE-FUNCTION). NAME is the name of the buffer-local variable indicating that the minor mode is active. RESTORE-FUNCTION is the function to activate the minor mode. -called. RESTORE-FUNCTION nil means don't try to restore the minor mode. +RESTORE-FUNCTION nil means don't try to restore the minor mode. Only minor modes for which the name of the buffer-local variable and the name of the minor mode function are different have to be added to this table. See also `desktop-minor-mode-handlers'." |