diff options
| -rw-r--r-- | src/gui.c | 8 | ||||
| -rw-r--r-- | src/normal.c | 1 | ||||
| -rw-r--r-- | src/proto/gui.pro | 2 | ||||
| -rw-r--r-- | src/quickfix.c | 2 |
4 files changed, 7 insertions, 6 deletions
@@ -4467,23 +4467,23 @@ gui_update_horiz_scrollbar(force) */ int gui_do_horiz_scroll(leftcol, compute_longest_lnum) - colnr_T leftcol; + long_u leftcol; int compute_longest_lnum; { /* no wrapping, no scrolling */ if (curwin->w_p_wrap) return FALSE; - if (curwin->w_leftcol == leftcol) + if (curwin->w_leftcol == (colnr_T)leftcol) 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 * longest visible line. */ if (vim_strchr(p_go, GO_HORSCROLL) == NULL && !virtual_active() - && leftcol > scroll_line_len(curwin->w_cursor.lnum)) + && (colnr_T)leftcol > scroll_line_len(curwin->w_cursor.lnum)) { if (compute_longest_lnum) { diff --git a/src/normal.c b/src/normal.c index d880ee60d..9e75afc9e 100644 --- a/src/normal.c +++ b/src/normal.c @@ -4582,6 +4582,7 @@ nv_mousescroll(cap) if (!curwin->w_p_wrap) { int val, step = 6; + if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL)) step = W_WIDTH(curwin); val = curwin->w_leftcol + (cap->arg == MSCR_RIGHT ? -step : +step); diff --git a/src/proto/gui.pro b/src/proto/gui.pro index fa5ce8944..29f87ef65 100644 --- a/src/proto/gui.pro +++ b/src/proto/gui.pro @@ -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_update_scrollbars __ARGS((int force)); 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)); guicolor_T gui_get_color __ARGS((char_u *name)); int gui_get_lightness __ARGS((guicolor_T pixel)); diff --git a/src/quickfix.c b/src/quickfix.c index 883de8c72..3ecc81c72 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -898,7 +898,7 @@ qf_new_list(qi, qf_title) qi->qf_lists[qi->qf_curlist].qf_count = 0; 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; if (p != NULL) |