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

vim-patch:9.1.0166: Internal error with blockwise getregion() in another buffer (#27819)

Browse Source 
Problem:  Internal error with blockwise getregion() in another buffer
Solution: Also change curwin->w_buffer when changing curbuf (zeertzjq)

closes: vim/vim#14179

5406eb8722
This commit is contained in:
zeertzjq
2024-03-12 07:19:30 +08:00
committed by GitHub
parent cf156377e8
commit 6481da3015
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/eval/funcs.c
View File

@@ -2863,16 +2863,10 @@ static void f_getregion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
return;
}
buf_T *const save_curbuf = curbuf;
buf_T *findbuf = curbuf;
if (fnum1 != 0) {
findbuf = buflist_findnr(fnum1);
// buffer not loaded
if (findbuf == NULL || findbuf->b_ml.ml_mfp == NULL) {
emsg(_(e_buffer_is_not_loaded));
return;
}
buf_T *findbuf = fnum1 != 0 ? buflist_findnr(fnum1) : curbuf;
if (findbuf == NULL || findbuf->b_ml.ml_mfp == NULL) {
emsg(_(e_buffer_is_not_loaded));
return;
}
if (p1.lnum < 1 || p1.lnum > findbuf->b_ml.ml_line_count) {
@@ -2892,7 +2886,9 @@ static void f_getregion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
return;
}
buf_T *const save_curbuf = curbuf;
curbuf = findbuf;
curwin->w_buffer = curbuf;
const TriState save_virtual = virtual_op;
virtual_op = virtual_active();
@@ -2975,10 +2971,8 @@ static void f_getregion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
tv_list_append_allocated_string(rettv->vval.v_list, akt);
}
if (curbuf != save_curbuf) {
curbuf = save_curbuf;
}
curbuf = save_curbuf;
curwin->w_buffer = curbuf;
virtual_op = save_virtual;
}