summaryrefslogtreecommitdiffstats
path: root/src/gui.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-04-17 22:14:47 +0000
committerBram Moolenaar <Bram@vim.org>2006-04-17 22:14:47 +0000
commita93fa7ee7856b54d3778e613c7b7e4b76aaeb2af (patch)
tree4797f43c4e1694903d93da1b61ba972955cb6aad /src/gui.c
parentb21e5843e53d3582df5f521f57e7e52e83d51d10 (diff)
updated for version 7.0e01v7.0e01
Diffstat (limited to 'src/gui.c')
-rw-r--r--src/gui.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui.c b/src/gui.c
index 5ede4c1bea..c377a35dff 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2566,7 +2566,7 @@ gui_redraw_block(row1, col1, row2, col2, flags)
/* Put the cursor back where it was */
gui.row = old_row;
gui.col = old_col;
- gui.highlight_mask = old_hl_mask;
+ gui.highlight_mask = (int)old_hl_mask;
return retval;
}
@@ -4345,7 +4345,7 @@ gui_do_horiz_scroll()
if (curwin->w_leftcol == scrollbar_value)
return FALSE;
- curwin->w_leftcol = scrollbar_value;
+ curwin->w_leftcol = (colnr_T)scrollbar_value;
/* When the line of the cursor is too short, move the cursor to the
* longest visible line. Do a sanity check on "longest_lnum", just in
@@ -4427,9 +4427,9 @@ gui_get_lightness(pixel)
{
long_u rgb = gui_mch_get_rgb(pixel);
- return ( (((rgb >> 16) & 0xff) * 299)
- + (((rgb >> 8) & 0xff) * 587)
- + ((rgb & 0xff) * 114)) / 1000;
+ return (int)( (((rgb >> 16) & 0xff) * 299)
+ + (((rgb >> 8) & 0xff) * 587)
+ + ((rgb & 0xff) * 114)) / 1000;
}
#if defined(FEAT_GUI_X11) || defined(PROTO)
@@ -4808,7 +4808,7 @@ get_find_dialog_text(arg, wwordp, mcasep)
text = vim_strsave(text);
if (text != NULL)
{
- int len = STRLEN(text);
+ int len = (int)STRLEN(text);
int i;
/* Remove "\V" */