IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1521: when a popup window is closed the buffer remains (#26024)

Browse Source 
Problem:    When a popup window is closed the buffer remains.
Solution:   Wipe out the buffer.

7c7f01e2b2

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-11-13 15:41:22 +08:00 committed by GitHub
parent 91872d7712
commit 422af9c5c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/window.c
View File

@ -2756,10 +2756,11 @@ static bool close_last_window_tabpage(win_T *win, bool free_buf, tabpage_T *prev
return true; return true;
} }
/// Close the buffer of "win" and unload it if "free_buf" is true. /// Close the buffer of "win" and unload it if "action" is DOBUF_UNLOAD.
/// "action" can also be zero (do nothing).
/// "abort_if_last" is passed to close_buffer(): abort closing if all other /// "abort_if_last" is passed to close_buffer(): abort closing if all other
/// windows are closed. /// windows are closed.
static void win_close_buffer(win_T *win, bool free_buf, bool abort_if_last) static void win_close_buffer(win_T *win, int action, bool abort_if_last)
{ {
// Free independent synblock before the buffer is freed. // Free independent synblock before the buffer is freed.
if (win->w_buffer != NULL) { if (win->w_buffer != NULL) {
@ -2778,7 +2779,7 @@ static void win_close_buffer(win_T *win, bool free_buf, bool abort_if_last)
bufref_T bufref; bufref_T bufref;
set_bufref(&bufref, curbuf); set_bufref(&bufref, curbuf);
win->w_closing = true; win->w_closing = true;
close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, abort_if_last, true); close_buffer(win, win->w_buffer, action, abort_if_last, true);
if (win_valid_any_tab(win)) { if (win_valid_any_tab(win)) {
win->w_closing = false; win->w_closing = false;
} }
@ -2908,7 +2909,7 @@ int win_close(win_T *win, bool free_buf, bool force)
return OK; return OK;
} }
win_close_buffer(win, free_buf, true); win_close_buffer(win, free_buf ? DOBUF_UNLOAD : 0, true);
if (only_one_window() && win_valid(win) && win->w_buffer == NULL if (only_one_window() && win_valid(win) && win->w_buffer == NULL
&& (last_window(win) || curtab != prev_curtab && (last_window(win) || curtab != prev_curtab