diff options
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 45 |
1 files changed, 12 insertions, 33 deletions
diff --git a/src/keymap.c b/src/keymap.c index 40005a51008..8a0c855e0dc 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -3140,15 +3140,9 @@ You type Translation\n\ | |||
| 3140 | don't omit it; instead, mention it but say it is shadowed. */ | 3140 | don't omit it; instead, mention it but say it is shadowed. */ |
| 3141 | 3141 | ||
| 3142 | void | 3142 | void |
| 3143 | describe_map_tree (startmap, partial, shadow, prefix, title, nomenu, transl, | 3143 | describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow, |
| 3144 | always_title, mention_shadow) | 3144 | Lisp_Object prefix, char *title, int nomenu, int transl, |
| 3145 | Lisp_Object startmap, shadow, prefix; | 3145 | int always_title, int mention_shadow) |
| 3146 | int partial; | ||
| 3147 | char *title; | ||
| 3148 | int nomenu; | ||
| 3149 | int transl; | ||
| 3150 | int always_title; | ||
| 3151 | int mention_shadow; | ||
| 3152 | { | 3146 | { |
| 3153 | Lisp_Object maps, orig_maps, seen, sub_shadows; | 3147 | Lisp_Object maps, orig_maps, seen, sub_shadows; |
| 3154 | struct gcpro gcpro1, gcpro2, gcpro3; | 3148 | struct gcpro gcpro1, gcpro2, gcpro3; |
| @@ -3355,16 +3349,10 @@ describe_map_compare (const void *aa, const void *bb) | |||
| 3355 | PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above. */ | 3349 | PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above. */ |
| 3356 | 3350 | ||
| 3357 | static void | 3351 | static void |
| 3358 | describe_map (map, prefix, elt_describer, partial, shadow, | 3352 | describe_map (Lisp_Object map, Lisp_Object prefix, |
| 3359 | seen, nomenu, mention_shadow) | 3353 | void (*elt_describer) (Lisp_Object, Lisp_Object), |
| 3360 | register Lisp_Object map; | 3354 | int partial, Lisp_Object shadow, |
| 3361 | Lisp_Object prefix; | 3355 | Lisp_Object *seen, int nomenu, int mention_shadow) |
| 3362 | void (*elt_describer) (Lisp_Object, Lisp_Object); | ||
| 3363 | int partial; | ||
| 3364 | Lisp_Object shadow; | ||
| 3365 | Lisp_Object *seen; | ||
| 3366 | int nomenu; | ||
| 3367 | int mention_shadow; | ||
| 3368 | { | 3356 | { |
| 3369 | Lisp_Object tail, definition, event; | 3357 | Lisp_Object tail, definition, event; |
| 3370 | Lisp_Object tem; | 3358 | Lisp_Object tem; |
| @@ -3603,20 +3591,11 @@ DESCRIBER is the output function used; nil means use `princ'. */) | |||
| 3603 | ARGS is simply passed as the second argument to ELT_DESCRIBER. */ | 3591 | ARGS is simply passed as the second argument to ELT_DESCRIBER. */ |
| 3604 | 3592 | ||
| 3605 | static void | 3593 | static void |
| 3606 | describe_vector (vector, prefix, args, elt_describer, | 3594 | describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, |
| 3607 | partial, shadow, entire_map, | 3595 | void (*elt_describer) (Lisp_Object, Lisp_Object), |
| 3608 | indices, char_table_depth, keymap_p, | 3596 | int partial, Lisp_Object shadow, Lisp_Object entire_map, |
| 3609 | mention_shadow) | 3597 | int *indices, int char_table_depth, int keymap_p, |
| 3610 | register Lisp_Object vector; | 3598 | int mention_shadow) |
| 3611 | Lisp_Object prefix, args; | ||
| 3612 | void (*elt_describer) (Lisp_Object, Lisp_Object); | ||
| 3613 | int partial; | ||
| 3614 | Lisp_Object shadow; | ||
| 3615 | Lisp_Object entire_map; | ||
| 3616 | int *indices; | ||
| 3617 | int char_table_depth; | ||
| 3618 | int keymap_p; | ||
| 3619 | int mention_shadow; | ||
| 3620 | { | 3599 | { |
| 3621 | Lisp_Object definition; | 3600 | Lisp_Object definition; |
| 3622 | Lisp_Object tem2; | 3601 | Lisp_Object tem2; |