aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 9.1.0679: Rename from w_closing to w_locked is incomplete

Browse Source 
Problem:  Rename from w_closing to w_locked is incomplete
          (after 9.1.0678).
Solution: Rename remaining occurrences of w_closing to w_locked and
          update comments (zeertzjq).

closes: #15504

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-08-16 21:11:31 +02:00
committed by Christian Brabandt
parent 6908db4756
commit bc11f6d9d4
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_cmds.c
View File

@@ -2838,7 +2838,7 @@ do_ecmd(
int did_decrement; int did_decrement;
buf_T *was_curbuf = curbuf; buf_T *was_curbuf = curbuf;
// Set the w_closing flag to avoid that autocommands close the // Set the w_locked flag to avoid that autocommands close the
// window. And set b_locked for the same reason. // window. And set b_locked for the same reason.
the_curwin->w_locked = TRUE; the_curwin->w_locked = TRUE;
++buf->b_locked; ++buf->b_locked;

3
src/structs.h
View File

@@ -3785,8 +3785,7 @@ struct window_S
synblock_T *w_s; // for :ownsyntax synblock_T *w_s; // for :ownsyntax
#endif #endif
int w_locked; // window is being closed, don't let int w_locked; // don't let autocommands close the window
// autocommands close it too.
frame_T *w_frame; // frame containing this window frame_T *w_frame; // frame containing this window

8
src/terminal.c
View File

@@ -3647,7 +3647,7 @@ term_after_channel_closed(term_T *term)
if (term->tl_finish == TL_FINISH_CLOSE) if (term->tl_finish == TL_FINISH_CLOSE)
{ {
aco_save_T aco; aco_save_T aco;
int do_set_w_closing = term->tl_buffer->b_nwindows == 0; int do_set_w_locked = term->tl_buffer->b_nwindows == 0;
#ifdef FEAT_PROP_POPUP #ifdef FEAT_PROP_POPUP
win_T *pwin = NULL; win_T *pwin = NULL;
@@ -3678,11 +3678,11 @@ term_after_channel_closed(term_T *term)
{ {
// Avoid closing the window if we temporarily use it. // Avoid closing the window if we temporarily use it.
if (is_aucmd_win(curwin)) if (is_aucmd_win(curwin))
do_set_w_closing = TRUE; do_set_w_locked = TRUE;
if (do_set_w_closing) if (do_set_w_locked)
curwin->w_locked = TRUE; curwin->w_locked = TRUE;
do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE); do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE);
if (do_set_w_closing) if (do_set_w_locked)
curwin->w_locked = FALSE; curwin->w_locked = FALSE;
aucmd_restbuf(&aco); aucmd_restbuf(&aco);
} }

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
679,
/**/ /**/
678, 678,
/**/ /**/