aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ops.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2021-09-10 08:43:45 -0700
committerGitHub <noreply@github.com>2021-09-10 08:43:45 -0700
commit7525052270c4c5e62b9b5bc7dbc20b851f986900 (patch)
tree2e29d778af83871bed859d1301ecdd1bb09979cb /src/nvim/ops.c
parent0dcfd0e8d101389fb6a33a7e887114ea0c062648 (diff)
parent36aff87ab6a043a31c13daf4522843498b98c93f (diff)
downloadrneovim-7525052270c4c5e62b9b5bc7dbc20b851f986900.tar.gz
rneovim-7525052270c4c5e62b9b5bc7dbc20b851f986900.tar.bz2
rneovim-7525052270c4c5e62b9b5bc7dbc20b851f986900.zip
Merge #15626 vim-patch:8.1.{2281,2283},8.2.{2903,3391,3397}
Diffstat (limited to 'src/nvim/ops.c')
-rw-r--r--src/nvim/ops.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 12c3681089..3f0d85dc88 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -5726,16 +5726,19 @@ void cursor_pos_info(dict_T *dict)
}
if (l_VIsual_mode == Ctrl_V) {
- char_u * saved_sbr = p_sbr;
+ char_u *const saved_sbr = p_sbr;
+ char_u *const saved_w_sbr = curwin->w_p_sbr;
// Make 'sbr' empty for a moment to get the correct size.
p_sbr = empty_option;
+ curwin->w_p_sbr = empty_option;
oparg.is_VIsual = true;
oparg.motion_type = kMTBlockWise;
oparg.op_type = OP_NOP;
getvcols(curwin, &min_pos, &max_pos,
&oparg.start_vcol, &oparg.end_vcol);
p_sbr = saved_sbr;
+ curwin->w_p_sbr = saved_w_sbr;
if (curwin->w_curswant == MAXCOL) {
oparg.end_vcol = MAXCOL;
}