mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 15:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1516 from fmoralesc/new-patches

Browse Source 
vim-patch:7.4.425,435,467,472,473,478
This commit is contained in:
Justin M. Keyes
2014-11-27 20:58:39 -05:00
parent e5a386d2f8 9ab44e74ab
commit 49b65b0fcd
7 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/normal.c
View File

@@ -1091,6 +1091,10 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
pos_T old_cursor;
bool empty_region_error;
int restart_edit_save;
int lbr_saved = curwin->w_p_lbr;
curwin->w_p_lbr = false; /* avoid a problem with unwanted linebreaks in
* block mode */
/* The visual area is remembered for redo */
static int redo_VIsual_mode = NUL; /* 'v', 'V', or Ctrl-V */
@@ -1703,6 +1707,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
oap->block_mode = false;
clearop(oap);
}
curwin->w_p_lbr = lbr_saved;
}
/*
@@ -3484,7 +3489,11 @@ static bool nv_screengo(oparg_T *oap, int dir, long dist)
* screenline or move two screenlines.
*/
validate_virtcol();
if (curwin->w_virtcol > curwin->w_curswant
colnr_T virtcol = curwin->w_virtcol;
if (virtcol > (colnr_T)width1 && *p_sbr != NUL)
virtcol -= vim_strsize(p_sbr);
if (virtcol > curwin->w_curswant
&& (curwin->w_curswant < (colnr_T)width1
? (curwin->w_curswant > (colnr_T)width1 / 2)
: ((curwin->w_curswant - width1) % width2