diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-25 04:12:04 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-25 04:12:04 -0400 |
| commit | 6f980346864251d2ed86d85c63fd6ec375e21edc (patch) | |
| tree | e640731f2b18974afab3f83c5241f83adb1fd5a1 /src/nvim/normal.c | |
| parent | 588bc1d9586bc65b63519bc9d292fa4ab59b2dba (diff) | |
| parent | 23e8d6d94b74c7b6d4e4c766e34500ff220abe96 (diff) | |
| download | rneovim-6f980346864251d2ed86d85c63fd6ec375e21edc.tar.gz rneovim-6f980346864251d2ed86d85c63fd6ec375e21edc.tar.bz2 rneovim-6f980346864251d2ed86d85c63fd6ec375e21edc.zip | |
Merge pull request #4632 from KillTheMule/vim-7.4.822
vim-patch:7.4.822
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 9173ea2d17..75ee11bc9d 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -2598,11 +2598,10 @@ do_mouse ( end_visual.col = leftcol; else end_visual.col = rightcol; - if (curwin->w_cursor.lnum < - (start_visual.lnum + end_visual.lnum) / 2) - end_visual.lnum = end_visual.lnum; - else + if (curwin->w_cursor.lnum >= + (start_visual.lnum + end_visual.lnum) / 2) { end_visual.lnum = start_visual.lnum; + } /* move VIsual to the right column */ start_visual = curwin->w_cursor; /* save the cursor pos */ @@ -3244,9 +3243,9 @@ void clear_showcmd(void) top = curwin->w_cursor.lnum; bot = VIsual.lnum; } - /* Include closed folds as a whole. */ - hasFolding(top, &top, NULL); - hasFolding(bot, NULL, &bot); + // Include closed folds as a whole. + (void)hasFolding(top, &top, NULL); + (void)hasFolding(bot, NULL, &bot); lines = bot - top + 1; if (VIsual_mode == Ctrl_V) { @@ -5154,9 +5153,10 @@ static void nv_gotofile(cmdarg_T *cap) ptr = grab_file_name(cap->count1, &lnum); if (ptr != NULL) { - /* do autowrite if necessary */ - if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf)) - autowrite(curbuf, false); + // do autowrite if necessary + if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf)) { + (void)autowrite(curbuf, false); + } setpcmark(); (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, P_HID(curbuf) ? ECMD_HIDE : 0, curwin); |