aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorAndreas Schwab2010-07-12 19:47:17 +0200
committerAndreas Schwab2010-07-12 19:47:17 +0200
commitd5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e (patch)
treeeeb2e0ed5cb8f7ccb1cd41cfceb03c6aaa2897fc /src/keymap.c
parentded80a25b7d4a088dd4c4a714666705749106138 (diff)
downloademacs-d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e.tar.gz
emacs-d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e.zip
Convert old-style definitions
* editfns.c (transpose_markers): Convert old-style definition. * emacs.c (abort, shut_down_emacs, fixup_locale) (synchronize_system_time_locale) (synchronize_system_messages_locale, syms_of_emacs): Likewise. * floatfns.c (extract_float, matherr, init_floatfns) (syms_of_floatfns): Likewise. * fns.c (make_hash_table): Likewise. * ftfont.c (ftfont_get_otf, ftfont_otf_features) (ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics) (ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape) (ftfont_variation_glyphs): Likewise. * gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise. * keymap.c (describe_map_tree, describe_map, describe_vector): Likewise. * lread.c (read_filtered_event): Likewise. * minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise. * process.c (wait_reading_process_output): Likewise. * scroll.c (do_line_insertion_deletion_costs): Likewise. * search.c (search_buffer, boyer_moore): Likewise. * syntax.c (scan_sexps_forward): Likewise. * xdisp.c (try_scrolling): Likewise. * xfaces.c (face_at_buffer_position, face_for_overlay_string) (face_at_string_position): Likewise. * xfns.c (x_default_scroll_bar_color_parameter): Likewise. * xselect.c (x_get_window_property, receive_incremental_selection) (x_get_window_property_as_lisp_data, lisp_data_to_selection_data): Likewise. * xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c45
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
3142void 3142void
3143describe_map_tree (startmap, partial, shadow, prefix, title, nomenu, transl, 3143describe_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
3357static void 3351static void
3358describe_map (map, prefix, elt_describer, partial, shadow, 3352describe_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
3605static void 3593static void
3606describe_vector (vector, prefix, args, elt_describer, 3594describe_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;