From 9530a23016808fa5587e07d3d335852b90069c0f Mon Sep 17 00:00:00 2001 From: Evgeni Chasnovski Date: Thu, 28 Mar 2024 15:30:16 +0200 Subject: fix(intro): link showing intro to state at start Problem: Current behavior of stateful intro message is too persistent. For example, it is still drawn if new empty buffer is shown in current window (either by explicitly setting it or after `tabnew`). Although the buffer is empty, the act of it being shown should be made visible. Solution: Make intro message persist if all is true: - Current buffer is the same as it was just after start, i.e. empty nameless with initial handle (i.e. 1). - Current window is the same as it was just after start, i.e. single non-floating with initial handle. --- src/nvim/version.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/version.c b/src/nvim/version.c index 14e2491d18..5443371ba7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -2715,9 +2715,11 @@ void list_version(void) /// Whether it still is not too late to show an intro message bool may_show_intro(void) { - return (buf_is_empty(firstwin->w_buffer) - && (firstwin->w_buffer->b_fname == NULL) - && one_window(firstwin) + return (buf_is_empty(curbuf) + && (curbuf->b_fname == NULL) + && (curbuf->handle == 1) + && (curwin->handle == LOWEST_WIN_ID) + && one_window(curwin) && (vim_strchr(p_shm, SHM_INTRO) == NULL)); } -- cgit