diff options
| author | Karoly Lorentey <[email protected]> | 2005-02-25 13:02:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-02-25 13:02:38 +0000 |
| commit | 047ba4c2fb052fb5187226fe5589a1be9d36b687 (patch) | |
| tree | d4c8a6e4c99ceea8a3d16dc02c4f33e904f5b6ea /lispref | |
| parent | 37acc4209655b0a2267ee997cca8ebe42274b877 (diff) | |
| parent | ff4d39263e40ffb88d9aee64f2e35b0e921c6553 (diff) | |
Merged from [email protected] (patch 28-30, 126-128)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-126
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-127
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-128
Merge from gnus--rel--5.10
* [email protected]/gnus--rel--5.10--patch-28
Update from CVS
* [email protected]/gnus--rel--5.10--patch-29
Update from CVS
* [email protected]/gnus--rel--5.10--patch-30
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-301
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 8 | ||||
| -rw-r--r-- | lispref/modes.texi | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 4d990a61f8..e7f05587e7 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,5 +1,13 @@ +2005-02-24 Lute Kamstra <[email protected]> + + * modes.texi (Defining Minor Modes): Explain that INIT-VALUE, + LIGHTER, and KEYMAP can be omitted when KEYWORD-ARGS are used. + 2005-02-23 Lute Kamstra <[email protected]> + * modes.texi (Defining Minor Modes): define-minor-mode can be used + to define global minor modes as well. + * display.texi (Managing Overlays): overlay-buffer returns nil for deleted overlays. diff --git a/lispref/modes.texi b/lispref/modes.texi index 62f152e1d4..530044ac03 100644 --- a/lispref/modes.texi +++ b/lispref/modes.texi @@ -1100,7 +1100,7 @@ characters are reserved for major modes.) The macro @code{define-minor-mode} offers a convenient way of implementing a mode in one self-contained definition. -@defmac define-minor-mode mode doc [init-value [lighter [keymap keyword-args... body...]]] +@defmac define-minor-mode mode doc [init-value [lighter [keymap]]] keyword-args... body... @tindex define-minor-mode This macro defines a new minor mode whose name is @var{mode} (a symbol). It defines a command named @var{mode} to toggle the minor @@ -1121,8 +1121,10 @@ specifying bindings in this form: (@var{key-sequence} . @var{definition}) @end example -The @var{keyword-args} consist of keywords followed by corresponding -values. A few keywords have special meanings: +The above three arguments @var{init-value}, @var{lighter}, and +@var{keymap} can be (partially) omitted when @var{keyword-args} are +used. The @var{keyword-args} consist of keywords followed by +corresponding values. A few keywords have special meanings: @table @code @item :global @var{global} |