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

patch 9.0.0910: setting lines in another buffer may not work well

Browse Source 
Problem:    Setting lines in another buffer may not work well.
Solution:   Make sure the buffer being changed has a window. (issue #11558)
This commit is contained in:
Bram Moolenaar 2022-11-19 13:59:43 +00:00
parent 9fda81515b
commit c934bfa1b7
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/evalbuffer.c
View File

@ -137,14 +137,15 @@ set_buffer_lines(
listitem_T *li = NULL; listitem_T *li = NULL;
long added = 0; long added = 0;
linenr_T append_lnum; linenr_T append_lnum;
buf_T *curbuf_save = NULL;
win_T *curwin_save = NULL; win_T *curwin_save = NULL;
int is_curbuf = buf == curbuf; aco_save_T aco;
int using_aco = FALSE;
int save_VIsual_active = VIsual_active; int save_VIsual_active = VIsual_active;
// When using the current buffer ml_mfp will be set if needed. Useful when // When using the current buffer ml_mfp will be set if needed. Useful when
// setline() is used on startup. For other buffers the buffer must be // setline() is used on startup. For other buffers the buffer must be
// loaded. // loaded.
int is_curbuf = buf == curbuf;
if (buf == NULL || (!is_curbuf && buf->b_ml.ml_mfp == NULL) || lnum < 1) if (buf == NULL || (!is_curbuf && buf->b_ml.ml_mfp == NULL) || lnum < 1)
{ {
rettv->vval.v_number = 1; // FAIL rettv->vval.v_number = 1; // FAIL
@ -155,11 +156,21 @@ set_buffer_lines(
if (!is_curbuf) if (!is_curbuf)
{ {
// Set "curbuf" to the buffer being changed. Then make sure there is a
// window for it to handle any side effects.
VIsual_active = FALSE; VIsual_active = FALSE;
curbuf_save = curbuf;
curwin_save = curwin; curwin_save = curwin;
curbuf = buf; curbuf = buf;
find_win_for_curbuf(); find_win_for_curbuf(); // simplest: find existing window for "buf"
if (curwin->w_buffer != buf)
{
// No existing window for this buffer. It is dangerous to have
// curwin->w_buffer differ from "curbuf", use the autocmd window.
curbuf = curwin->w_buffer;
aucmd_prepbuf(&aco, buf);
using_aco = TRUE;
}
} }
if (append) if (append)
@ -262,8 +273,15 @@ set_buffer_lines(
done: done:
if (!is_curbuf) if (!is_curbuf)
{ {
curbuf = curbuf_save; if (using_aco)
curwin = curwin_save; {
aucmd_restbuf(&aco);
}
else
{
curwin = curwin_save;
curbuf = curwin->w_buffer;
}
VIsual_active = save_VIsual_active; VIsual_active = save_VIsual_active;
} }
} }

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
910,
/**/ /**/
909, 909,
/**/ /**/