thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0147: block Visual mode operators not correct when 'linebreak' set

Browse Source 
Problem:    Block Visual mode operators not correct when 'linebreak' set.
Solution:   Set w_p_lbr to lbr_saved more often. (Ken Takata, closes #5524)
This commit is contained in:
Bram Moolenaar
2020-01-23 20:58:09 +01:00
parent dfede9a70b
commit 03c3bd9fd0
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ops.c
View File

@@ -2744,7 +2744,12 @@ block_prep(
char_u *line;
char_u *prev_pstart;
char_u *prev_pend;
#ifdef FEAT_LINEBREAK
int lbr_saved = curwin->w_p_lbr;
// Avoid a problem with unwanted linebreaks in block mode.
curwin->w_p_lbr = FALSE;
#endif
bdp->startspaces = 0;
bdp->endspaces = 0;
bdp->textlen = 0;
@@ -2863,6 +2868,9 @@ block_prep(
}
bdp->textcol = (colnr_T) (pstart - line);
bdp->textstart = pstart;
#ifdef FEAT_LINEBREAK
curwin->w_p_lbr = lbr_saved;
#endif
}
/*
@@ -4556,11 +4564,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
#ifdef FEAT_LINEBREAK
// Restore linebreak, so that when the user edits it looks as
// before.
if (curwin->w_p_lbr != lbr_saved)
{
curwin->w_p_lbr = lbr_saved;
get_op_vcol(oap, redo_VIsual_mode, FALSE);
}
curwin->w_p_lbr = lbr_saved;
#endif
// Reset finish_op now, don't want it set inside edit().
finish_op = FALSE;
@@ -4663,11 +4667,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
#ifdef FEAT_LINEBREAK
// Restore linebreak, so that when the user edits it looks as
// before.
if (curwin->w_p_lbr != lbr_saved)
{
curwin->w_p_lbr = lbr_saved;
get_op_vcol(oap, redo_VIsual_mode, FALSE);
}
curwin->w_p_lbr = lbr_saved;
#endif
op_insert(oap, cap->count1);
#ifdef FEAT_LINEBREAK
@@ -4698,11 +4698,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
#ifdef FEAT_LINEBREAK
// Restore linebreak, so that when the user edits it looks as
// before.
if (curwin->w_p_lbr != lbr_saved)
{
curwin->w_p_lbr = lbr_saved;
get_op_vcol(oap, redo_VIsual_mode, FALSE);
}
curwin->w_p_lbr = lbr_saved;
#endif
op_replace(oap, cap->nchar);
}