diff options
| author | Dan Nicolaescu | 2010-07-04 21:52:39 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-04 21:52:39 -0700 |
| commit | dd4c5104086a55654982112f71c2f69e1e8e0cd1 (patch) | |
| tree | e27410ebcc2b0f4399d43b7e05e2519bc4599e43 /src/scroll.c | |
| parent | 9c8a2331d427aa8e7b2c7deeba04c76b56ce694c (diff) | |
| download | emacs-dd4c5104086a55654982112f71c2f69e1e8e0cd1.tar.gz emacs-dd4c5104086a55654982112f71c2f69e1e8e0cd1.zip | |
Convert declarations or definitions to standard C.
* src/xsmfns.c (smc_save_yourself_CB, smc_error_handler):
* src/xrdb.c (get_system_name):
* src/window.c (shrink_windows):
* src/syntax.c (forw_comment):
* src/scroll.c (calculate_scrolling, calculate_direct_scrolling)
(ins_del_costs):
* src/mem-limits.h (start_of_data):
* src/lread.c (readevalloop):
* src/gtkutil.c (xg_dialog_response_cb, xg_get_file_with_chooser)
(xg_get_file_with_selection, xg_update_menubar, xg_update_submenu):
* src/frame.c (x_get_focus_frame):
* src/floatfns.c (fmod_float):
* src/fileio.c (choose_write_coding_system):
* src/emacs.c (fatal_error_signal, init_cmdargs, argmatch)
(malloc_initialize_hook, sort_args, synchronize_locale):
* src/doprnt.c (doprnt):
* src/dired.c (compile_pattern):
* src/data.c (fmod_float):
* src/chartab.c (map_sub_char_table, map_sub_char_table_for_charset)
(map_char_table_for_charset):
* src/charset.c (define_charset_internal):
* src/alloc.c (Fgarbage_collect): Convert declarations or definitions
to standard C.
Diffstat (limited to 'src/scroll.c')
| -rw-r--r-- | src/scroll.c | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/src/scroll.c b/src/scroll.c index 410420df0b8..f05b59e3bfd 100644 --- a/src/scroll.c +++ b/src/scroll.c | |||
| @@ -86,17 +86,12 @@ static void do_scrolling (struct frame *, | |||
| 86 | new contents appears. */ | 86 | new contents appears. */ |
| 87 | 87 | ||
| 88 | static void | 88 | static void |
| 89 | calculate_scrolling (frame, matrix, window_size, lines_below, | 89 | calculate_scrolling (FRAME_PTR frame, |
| 90 | draw_cost, old_hash, new_hash, | 90 | /* matrix is of size window_size + 1 on each side. */ |
| 91 | free_at_end) | 91 | struct matrix_elt *matrix, |
| 92 | FRAME_PTR frame; | 92 | int window_size, int lines_below, |
| 93 | /* matrix is of size window_size + 1 on each side. */ | 93 | int *draw_cost, int *old_hash, int *new_hash, |
| 94 | struct matrix_elt *matrix; | 94 | int free_at_end) |
| 95 | int window_size, lines_below; | ||
| 96 | int *draw_cost; | ||
| 97 | int *old_hash; | ||
| 98 | int *new_hash; | ||
| 99 | int free_at_end; | ||
| 100 | { | 95 | { |
| 101 | register int i, j; | 96 | register int i, j; |
| 102 | int frame_lines = FRAME_LINES (frame); | 97 | int frame_lines = FRAME_LINES (frame); |
| @@ -424,18 +419,13 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m | |||
| 424 | is the equivalent of draw_cost for the old line contents */ | 419 | is the equivalent of draw_cost for the old line contents */ |
| 425 | 420 | ||
| 426 | static void | 421 | static void |
| 427 | calculate_direct_scrolling (frame, matrix, window_size, lines_below, | 422 | calculate_direct_scrolling (FRAME_PTR frame, |
| 428 | draw_cost, old_draw_cost, old_hash, new_hash, | 423 | /* matrix is of size window_size + 1 on each side. */ |
| 429 | free_at_end) | 424 | struct matrix_elt *matrix, |
| 430 | FRAME_PTR frame; | 425 | int window_size, int lines_below, |
| 431 | /* matrix is of size window_size + 1 on each side. */ | 426 | int *draw_cost, int *old_draw_cost, |
| 432 | struct matrix_elt *matrix; | 427 | int *old_hash, int *new_hash, |
| 433 | int window_size, lines_below; | 428 | int free_at_end) |
| 434 | int *draw_cost; | ||
| 435 | int *old_draw_cost; | ||
| 436 | int *old_hash; | ||
| 437 | int *new_hash; | ||
| 438 | int free_at_end; | ||
| 439 | { | 429 | { |
| 440 | register int i, j; | 430 | register int i, j; |
| 441 | int frame_lines = FRAME_LINES (frame); | 431 | int frame_lines = FRAME_LINES (frame); |
| @@ -956,15 +946,11 @@ line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn, register int | |||
| 956 | } | 946 | } |
| 957 | 947 | ||
| 958 | static void | 948 | static void |
| 959 | ins_del_costs (frame, | 949 | ins_del_costs (FRAME_PTR frame, |
| 960 | one_line_string, multi_string, | 950 | char *one_line_string, char *multi_string, |
| 961 | setup_string, cleanup_string, | 951 | char *setup_string, char *cleanup_string, |
| 962 | costvec, ncostvec, coefficient) | 952 | int *costvec, int *ncostvec, |
| 963 | FRAME_PTR frame; | 953 | int coefficient) |
| 964 | char *one_line_string, *multi_string; | ||
| 965 | char *setup_string, *cleanup_string; | ||
| 966 | int *costvec, *ncostvec; | ||
| 967 | int coefficient; | ||
| 968 | { | 954 | { |
| 969 | if (multi_string) | 955 | if (multi_string) |
| 970 | line_ins_del (frame, | 956 | line_ins_del (frame, |