diff options
| author | Miles Bader | 2007-07-15 04:47:46 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-15 04:47:46 +0000 |
| commit | 8c406a9bc42ee77fcbbb4201fe8bda855eafd832 (patch) | |
| tree | 14c8fa2e72341edd9db40b17079fd5208b1554c8 /src/keymap.h | |
| parent | 9bdeb5e9bedd773cc6845bc29a98e1e2a208f1ff (diff) | |
| parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
| download | emacs-8c406a9bc42ee77fcbbb4201fe8bda855eafd832.tar.gz emacs-8c406a9bc42ee77fcbbb4201fe8bda855eafd832.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 806-813)
- Merge from emacs--rel--22
- Update from CVS
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230
Diffstat (limited to 'src/keymap.h')
| -rw-r--r-- | src/keymap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.h b/src/keymap.h index 185ae70d945..df135114c87 100644 --- a/src/keymap.h +++ b/src/keymap.h | |||
| @@ -47,7 +47,7 @@ extern void syms_of_keymap P_ ((void)); | |||
| 47 | extern void keys_of_keymap P_ ((void)); | 47 | extern void keys_of_keymap P_ ((void)); |
| 48 | 48 | ||
| 49 | typedef void (*map_keymap_function_t) | 49 | typedef void (*map_keymap_function_t) |
| 50 | P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*)); | 50 | P_ ((Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data)); |
| 51 | extern void map_keymap P_ ((Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload)); | 51 | extern void map_keymap P_ ((Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload)); |
| 52 | 52 | ||
| 53 | #endif | 53 | #endif |