Ticket #1825: 1825-fixing_some_declarations.patch

File 1825-fixing_some_declarations.patch, 4.6 KB (added by vit_r, 14 years ago)

  • edit/edit-impl.h 

    From ba8645f061a671870b92420330a1d68430330412 Mon Sep 17 00:00:00 2001
From: Vit Rosin <vit_r@list.ru>
Date: Sat, 14 Nov 2009 15:18:05 +0000
Subject: [PATCH]  fixing_some_declarations

---
 edit/edit-impl.h |    6 +++---
 edit/edit.c      |   10 +++++-----
 edit/editcmd.c   |   11 ++++++-----
 edit/editdraw.c  |    2 +-
 edit/wordproc.c  |    2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/edit/edit-impl.h b/edit/edit-impl.h
index 4446f40..b6140d6 100644
    a b char *edit_get_byte_ptr (WEdit * edit, long byte_index); 
    159159char *edit_get_buf_ptr (WEdit * edit, long byte_index); 
    160160int edit_get_utf (WEdit * edit, long byte_index, int *char_width); 
    161161int edit_get_prev_utf (WEdit * edit, long byte_index, int *char_width); 
    162 int edit_count_lines (WEdit * edit, long current, int upto); 
    163 long edit_move_forward (WEdit * edit, long current, int lines, long upto); 
     162long edit_count_lines (WEdit * edit, long current, long upto); 
     163long edit_move_forward (WEdit * edit, long current, long lines, long upto); 
    164164long edit_move_forward3 (WEdit * edit, long current, int cols, long upto); 
    165 long edit_move_backward (WEdit * edit, long current, int lines); 
     165long edit_move_backward (WEdit * edit, long current, long lines); 
    166166void edit_scroll_screen_over_cursor (WEdit * edit); 
    167167void edit_render_keypress (WEdit * edit); 
    168168void edit_scroll_upward (WEdit * edit, unsigned long i); 

  • edit/edit.c 

    diff --git a/edit/edit.c b/edit/edit.c
index 9a51b79..39699cf 100644
    a b long edit_bol (WEdit * edit, long current) 
    15241524} 
    15251525 
    15261526 
    1527 int edit_count_lines (WEdit * edit, long current, int upto) 
     1527long edit_count_lines (WEdit * edit, long current, long upto) 
    15281528{ 
    1529     int lines = 0; 
     1529    long lines = 0; 
    15301530    if (upto > edit->last_byte) 
    15311531        upto = edit->last_byte; 
    15321532    if (current < 0) 
    … … int edit_count_lines (WEdit * edit, long current, int upto) 
    15401540 
    15411541/* If lines is zero this returns the count of lines from current to upto. */ 
    15421542/* If upto is zero returns index of lines forward current. */ 
    1543 long edit_move_forward (WEdit * edit, long current, int lines, long upto) 
     1543long edit_move_forward (WEdit * edit, long current, long lines, long upto) 
    15441544{ 
    15451545    if (upto) { 
    15461546        return edit_count_lines (edit, current, upto); 
    15471547    } else { 
    1548         int next; 
     1548        long next; 
    15491549        if (lines < 0) 
    15501550            lines = 0; 
    15511551        while (lines--) { 
    … … long edit_move_forward (WEdit * edit, long current, int lines, long upto) 
    15611561 
    15621562 
    15631563/* Returns offset of 'lines' lines up from current */ 
    1564 long edit_move_backward (WEdit * edit, long current, int lines) 
     1564long edit_move_backward (WEdit * edit, long current, long lines) 
    15651565{ 
    15661566    if (lines < 0) 
    15671567        lines = 0; 

  • edit/editcmd.c 

    diff --git a/edit/editcmd.c b/edit/editcmd.c
index 48f1db6..5abfc27 100644
    a b static void 
    8787edit_search_cmd_search_create_bookmark(WEdit * edit) 
    8888{ 
    8989    int found = 0, books = 0; 
    90     int l = 0, l_last = -1; 
     90    long l = 0, l_last = -1; 
    9191    long q = 0; 
    9292    gsize len = 0; 
    9393 
    … … edit_block_move_cmd (WEdit *edit) 
    12371237    edit_push_markers (edit); 
    12381238    current = edit->curs1; 
    12391239    if (column_highlighting) { 
    1240         int size, c1, c2, line; 
     1240        long line; 
     1241        int size, c1, c2; 
    12411242        line = edit->curs_line; 
    12421243        if (edit->mark2 < 0) 
    12431244            edit_mark_cmd (edit, 0); 
    … … static void 
    12981299edit_delete_column_of_text (WEdit * edit) 
    12991300{ 
    13001301    long p, q, r, m1, m2; 
    1301     int b, c, d; 
    1302     int n; 
     1302    long b, c, d, n; 
    13031303 
    13041304    eval_marks (edit, &m1, &m2); 
    13051305    n = edit_move_forward (edit, m1, 0, m2) + 1; 
    … … edit_get_block (WEdit *edit, long start, long finish, int *l) 
    18181818        *l = 0; 
    18191819        /* copy from buffer, excluding chars that are out of the column 'margins' */ 
    18201820        while (start < finish) { 
    1821             int c, x; 
     1821            int c; 
     1822            long x; 
    18221823            x = edit_move_forward3 (edit, edit_bol (edit, start), 0, 
    18231824                                    start); 
    18241825            c = edit_get_byte (edit, start); 

  • edit/editdraw.c 

    diff --git a/edit/editdraw.c b/edit/editdraw.c
index a6620eb..e5f7d5c 100644
    a b render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, 
    614614                  long end_column) 
    615615{ 
    616616    long row = 0, curs_row; 
    617     static int prev_curs_row = 0; 
     617    static long prev_curs_row = 0; 
    618618    static long prev_curs = 0; 
    619619 
    620620    int force = edit->force; 

  • edit/wordproc.c 

    diff --git a/edit/wordproc.c b/edit/wordproc.c
index e3c3055..bd74489 100644
    a b static int bad_line_start (WEdit * edit, long p) 
    9595static long 
    9696begin_paragraph (WEdit *edit, int force) 
    9797{ 
    98     int i; 
     98    long i; 
    9999    for (i = edit->curs_line - 1; i >= 0; i--) { 
    100100        if (line_is_blank (edit, i)) { 
    101101            i++;