From 9a51747bac45695aba40b3595c55237196b0fdcd Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 25 Jun 2007 20:53:48 +0000 Subject: * keymaps.texi (Active Keymaps): Document new POSITION argument of `current-active-maps'. * keymap.c (Fcurrent_active_maps): Add `position' argument. (Fwhere_is_internal): Adjust call to `current-active-maps' to cater for additional parameter. * keymap.h: Adjust number of parameters to `current-active-maps'. * doc.c (Fsubstitute_command_keys): Adjust call of `current-active-maps'. --- src/keymap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/keymap.h') diff --git a/src/keymap.h b/src/keymap.h index f55f76d500..185ae70d94 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -34,7 +34,7 @@ EXFUN (Fkey_binding, 4); EXFUN (Fkey_description, 2); EXFUN (Fsingle_key_description, 2); EXFUN (Fwhere_is_internal, 5); -EXFUN (Fcurrent_active_maps, 1); +EXFUN (Fcurrent_active_maps, 2); extern Lisp_Object access_keymap P_ ((Lisp_Object, Lisp_Object, int, int, int)); extern Lisp_Object get_keyelt P_ ((Lisp_Object, int)); extern Lisp_Object get_keymap P_ ((Lisp_Object, int, int)); -- cgit v1.2.3 From a1be1ce88b203a86b4f52b9f6e8360557098009a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 10 Jul 2007 15:13:33 +0000 Subject: (map_keymap_function_t): More informative prototype. --- src/ChangeLog | 4 ++++ src/keymap.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/keymap.h') diff --git a/src/ChangeLog b/src/ChangeLog index 489e68b37b..5c8a1db1dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-07-10 Stefan Monnier + + * keymap.h (map_keymap_function_t): More informative prototype. + 2007-07-10 Guanpeng Xu * search.c (Vinhibit_changing_match_data, search_regs_1): New vars. diff --git a/src/keymap.h b/src/keymap.h index 185ae70d94..df135114c8 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -47,7 +47,7 @@ extern void syms_of_keymap P_ ((void)); extern void keys_of_keymap P_ ((void)); typedef void (*map_keymap_function_t) - P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*)); + P_ ((Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data)); extern void map_keymap P_ ((Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload)); #endif -- cgit v1.2.3