Mercurial > vim
changeset 30160:fbf6084346cc v9.0.0416
patch 9.0.0416: ml_get error when appending lines in popup window
Commit: https://github.com/vim/vim/commit/58a3cae3eb590c375bf4823052e8d9d4165050de
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 8 13:43:10 2022 +0100
patch 9.0.0416: ml_get error when appending lines in popup window
Problem: ml_get error when appending lines in popup window.
Solution: Only update w_topline when w_buffer matches curbuf.
(closes #11074)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 08 Sep 2022 14:45:09 +0200 |
| parents | b3fe6af68a96 |
| children | 86b21b49d27d |
| files | src/evalbuffer.c src/testdir/dumps/Test_term_popup_bufline.dump src/testdir/test_popupwin.vim src/version.c |
| diffstat | 4 files changed, 45 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalbuffer.c +++ b/src/evalbuffer.c @@ -254,7 +254,11 @@ set_buffer_lines( && wp->w_cursor.lnum > append_lnum) wp->w_cursor.lnum += added; check_cursor_col(); - update_topline(); + + // Only update the window view if w_buffer matches curbuf, otherwise + // the computations will be wrong. + if (curwin->w_buffer == curbuf) + update_topline(); } done:
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_term_popup_bufline.dump @@ -0,0 +1,15 @@ +|1+0&#ffffff0| @73 +|2| @73 +|3| @73 +|4| @73 +>5| @35|0+0#0000001#ffd7ff255| +0#0000000#ffffff0@36 +|~+0#4040ff13&| @35|1+0#0000001#ffd7ff255| +0#4040ff13#ffffff0@36 +|!+2#ffffff16#00e0003|s|e|q| |1| |5| |[|f|i|n|i|s|h|e|d|]| @17|2+0#0000001#ffd7ff255| +2#ffffff16#00e0003@18|5|,|1| @11|A|l@1 +| +0#0000000#ffffff0@36|3+0#0000001#ffd7ff255| +0#0000000#ffffff0@36 +|~+0#4040ff13&| @35|4+0#0000001#ffd7ff255| +0#4040ff13#ffffff0@36 +|~| @35| +0#0000001#ffd7ff255| +0#4040ff13#ffffff0@36 +|~| @73 +|~| @73 +|~| @73 +|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1 +| +0&&@74
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -4174,5 +4174,28 @@ func Test_bufdel_skips_popupwin_buffer() call popup_close(id) endfunc +func Test_term_popup_bufline() + " very specific situation where a non-existing buffer line is used, leading + " to an ml_get error + CheckScreendump + + let lines =<< trim END + vim9script + &scrolloff = 5 + term_start('seq 1 5', {term_finish: 'open'}) + timer_start(50, (_) => { + set cpoptions&vim + var buf = popup_create([], {})->winbufnr() + appendbufline(buf, 0, range(5)) + }) + END + call writefile(lines, 'XtestTermPopup', 'D') + let buf = RunVimInTerminal('-S XtestTermPopup', #{rows: 15}) + call VerifyScreenDump(buf, 'Test_term_popup_bufline', {}) + + " clean up + call StopVimInTerminal(buf) +endfunc + " vim: shiftwidth=2 sts=2