patch 8.0.1274: setbufline() fails when using folding
Problem: setbufline() fails when using folding.
Solution: Set "curwin" if needed. (Ozaki Kiichi, closes #2293)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 25536af..5e22fe4 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -9891,7 +9891,8 @@
listitem_T *li = NULL;
long added = 0;
linenr_T lcount;
- buf_T *curbuf_save;
+ buf_T *curbuf_save = NULL;
+ win_T *curwin_save = NULL;
int is_curbuf = buf == curbuf;
/* When using the current buffer ml_mfp will be set if needed. Useful when
@@ -9903,8 +9904,22 @@
return;
}
- curbuf_save = curbuf;
- curbuf = buf;
+ if (!is_curbuf)
+ {
+ wininfo_T *wip;
+
+ curbuf_save = curbuf;
+ curwin_save = curwin;
+ curbuf = buf;
+ for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
+ {
+ if (wip->wi_win != NULL)
+ {
+ curwin = wip->wi_win;
+ break;
+ }
+ }
+ }
lcount = curbuf->b_ml.ml_line_count;
@@ -9967,7 +9982,11 @@
if (added > 0)
appended_lines_mark(lcount, added);
- curbuf = curbuf_save;
+ if (!is_curbuf)
+ {
+ curbuf = curbuf_save;
+ curwin = curwin_save;
+ }
}
/*