diff options
| author | Miles Bader | 2006-01-25 07:10:04 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-01-25 07:10:04 +0000 |
| commit | b2ba4dcba149f845bf7fcf15b6cede6a6cbcc336 (patch) | |
| tree | d9ca500b0501201584dbab3b74a83d1ba7e374c9 /src/keymap.c | |
| parent | 90fc2bc59774318b3db7c3642df00a1297f6b7ff (diff) | |
| parent | 7347faa822b5ea177df5b2ed7a2b7d79194f0bcc (diff) | |
| download | emacs-b2ba4dcba149f845bf7fcf15b6cede6a6cbcc336.tar.gz emacs-b2ba4dcba149f845bf7fcf15b6cede6a6cbcc336.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 4-14)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (base, patch 1-7)
- tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
- Update from CVS
- Merge from emacs--devo--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187)
- Update from CVS
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c index 07bf957cdca..31f80a2593a 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -718,8 +718,10 @@ map_keymap_call (key, val, fun, dummy) | |||
| 718 | } | 718 | } |
| 719 | 719 | ||
| 720 | DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 0, | 720 | DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 0, |
| 721 | doc: /* Call FUNCTION for every binding in KEYMAP. | 721 | doc: /* Call FUNCTION once for each binding in KEYMAP. |
| 722 | FUNCTION is called with two arguments: the event and its binding. | 722 | FUNCTION is called with two arguments: the event that is bound, and |
| 723 | the definition it is bound to. | ||
| 724 | |||
| 723 | If KEYMAP has a parent, the parent's bindings are included as well. | 725 | If KEYMAP has a parent, the parent's bindings are included as well. |
| 724 | This works recursively: if the parent has itself a parent, then the | 726 | This works recursively: if the parent has itself a parent, then the |
| 725 | grandparent's bindings are also included and so on. | 727 | grandparent's bindings are also included and so on. |