aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

Fix compiler warnings on 64 bit systems.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-07-26 22:51:28 +02:00
parent 0ed0eea206
commit 5e109c4ab0
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui.c
View File

@@ -4467,23 +4467,23 @@ gui_update_horiz_scrollbar(force)
*/ */
int int
gui_do_horiz_scroll(leftcol, compute_longest_lnum) gui_do_horiz_scroll(leftcol, compute_longest_lnum)
colnr_T leftcol; long_u leftcol;
int compute_longest_lnum; int compute_longest_lnum;
{ {
/* no wrapping, no scrolling */ /* no wrapping, no scrolling */
if (curwin->w_p_wrap) if (curwin->w_p_wrap)
return FALSE; return FALSE;
if (curwin->w_leftcol == leftcol) if (curwin->w_leftcol == (colnr_T)leftcol)
return FALSE; return FALSE;
curwin->w_leftcol = leftcol; curwin->w_leftcol = (colnr_T)leftcol;
/* When the line of the cursor is too short, move the cursor to the /* When the line of the cursor is too short, move the cursor to the
* longest visible line. */ * longest visible line. */
if (vim_strchr(p_go, GO_HORSCROLL) == NULL if (vim_strchr(p_go, GO_HORSCROLL) == NULL
&& !virtual_active() && !virtual_active()
&& leftcol > scroll_line_len(curwin->w_cursor.lnum)) && (colnr_T)leftcol > scroll_line_len(curwin->w_cursor.lnum))
{ {
if (compute_longest_lnum) if (compute_longest_lnum)
{ {

1
src/normal.c
View File

@@ -4582,6 +4582,7 @@ nv_mousescroll(cap)
if (!curwin->w_p_wrap) if (!curwin->w_p_wrap)
{ {
int val, step = 6; int val, step = 6;
if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL)) if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
step = W_WIDTH(curwin); step = W_WIDTH(curwin);
val = curwin->w_leftcol + (cap->arg == MSCR_RIGHT ? -step : +step); val = curwin->w_leftcol + (cap->arg == MSCR_RIGHT ? -step : +step);

2
src/proto/gui.pro
View File

@@ -46,7 +46,7 @@ void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging)
void gui_may_update_scrollbars __ARGS((void)); void gui_may_update_scrollbars __ARGS((void));
void gui_update_scrollbars __ARGS((int force)); void gui_update_scrollbars __ARGS((int force));
int gui_do_scroll __ARGS((void)); int gui_do_scroll __ARGS((void));
int gui_do_horiz_scroll __ARGS((colnr_T leftcol, int compute_longest_lnum)); int gui_do_horiz_scroll __ARGS((long_u leftcol, int compute_longest_lnum));
void gui_check_colors __ARGS((void)); void gui_check_colors __ARGS((void));
guicolor_T gui_get_color __ARGS((char_u *name)); guicolor_T gui_get_color __ARGS((char_u *name));
int gui_get_lightness __ARGS((guicolor_T pixel)); int gui_get_lightness __ARGS((guicolor_T pixel));

2
src/quickfix.c
View File

@@ -898,7 +898,7 @@ qf_new_list(qi, qf_title)
qi->qf_lists[qi->qf_curlist].qf_count = 0; qi->qf_lists[qi->qf_curlist].qf_count = 0;
if (qf_title != NULL) if (qf_title != NULL)
{ {
char_u *p = alloc(STRLEN(qf_title) + 2); char_u *p = alloc((int)STRLEN(qf_title) + 2);
qi->qf_lists[qi->qf_curlist].qf_title = p; qi->qf_lists[qi->qf_curlist].qf_title = p;
if (p != NULL) if (p != NULL)