diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2025-01-03 10:46:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-03 10:46:20 -0800 |
| commit | a09c7a5d57ba2aca58fbc00e0b04a1437555a3c0 (patch) | |
| tree | 7d068e82e41e44e3325fef63a6a7342234dc900a /src | |
| parent | b52531a9cbbd1843490333452cd124e8be070690 (diff) | |
| parent | 700a25e6218e016b5adb0ddee740be4618d717a2 (diff) | |
| download | rneovim-a09c7a5d57ba2aca58fbc00e0b04a1437555a3c0.tar.gz rneovim-a09c7a5d57ba2aca58fbc00e0b04a1437555a3c0.tar.bz2 rneovim-a09c7a5d57ba2aca58fbc00e0b04a1437555a3c0.zip | |
Merge #30384 test: spawn_wait()
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/grid.c | 3 | ||||
| -rw-r--r-- | src/nvim/main.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/grid.c b/src/nvim/grid.c index e863cb3476..df93ad1655 100644 --- a/src/nvim/grid.c +++ b/src/nvim/grid.c @@ -383,7 +383,8 @@ void grid_line_start(ScreenGrid *grid, int row) assert((size_t)grid_line_maxcol <= linebuf_size); - if (rdb_flags & kOptRdbFlagInvalid) { + if (full_screen && (rdb_flags & kOptRdbFlagInvalid)) { + assert(linebuf_char); // Current batch must not depend on previous contents of linebuf_char. // Set invalid values which will cause assertion failures later if they are used. memset(linebuf_char, 0xFF, sizeof(schar_T) * linebuf_size); diff --git a/src/nvim/main.c b/src/nvim/main.c index 348f246d27..2b55a48c12 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -634,6 +634,7 @@ int main(int argc, char **argv) if (params.luaf != NULL) { // Like "--cmd", "+", "-c" and "-S", don't truncate messages. msg_scroll = true; + DLOG("executing Lua -l script"); bool lua_ok = nlua_exec_file(params.luaf); TIME_MSG("executing Lua -l script"); if (msg_didout) { |