aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2025-01-22 17:10:29 +0800
committerGitHub <noreply@github.com>2025-01-22 17:10:29 +0800
commitd46ebd2a74036a349606213fcd2a8b3530adebcf (patch)
treec7b087ab87823ec2092abd3caca8de1e9658b3f8 /src
parenta66f6add29fd8b2ee352c6089ceca6ab4f522385 (diff)
downloadrneovim-d46ebd2a74036a349606213fcd2a8b3530adebcf.tar.gz
rneovim-d46ebd2a74036a349606213fcd2a8b3530adebcf.tar.bz2
rneovim-d46ebd2a74036a349606213fcd2a8b3530adebcf.zip
fix(startup): avoid crash with completion from -l script (#32160)
Related #27764
Diffstat (limited to 'src')
-rw-r--r--src/nvim/drawscreen.c7
-rw-r--r--src/nvim/main.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
index b1ea38e280..7ebd4f2866 100644
--- a/src/nvim/drawscreen.c
+++ b/src/nvim/drawscreen.c
@@ -177,14 +177,11 @@ bool default_grid_alloc(void)
resizing = true;
// Allocation of the screen buffers is done only when the size changes and
- // when Rows and Columns have been set and we have started doing full
- // screen stuff.
+ // when Rows and Columns have been set.
if ((default_grid.chars != NULL
&& Rows == default_grid.rows
&& Columns == default_grid.cols)
- || Rows == 0
- || Columns == 0
- || (!full_screen && default_grid.chars == NULL)) {
+ || Rows == 0 || Columns == 0) {
resizing = false;
return false;
}
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 58d110e8b2..0bd4277d19 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -360,7 +360,7 @@ int main(int argc, char **argv)
setbuf(stdout, NULL); // NOLINT(bugprone-unsafe-functions)
- full_screen = !silent_mode || exmode_active;
+ full_screen = !silent_mode;
// Set the default values for the options that use Rows and Columns.
win_init_size();