Mercurial > vim
changeset 35982:d8de3ac39c9b v9.1.0679
patch 9.1.0679: Rename from w_closing to w_locked is incomplete
Commit: https://github.com/vim/vim/commit/bc11f6d9d4f580179d3963f3c489881904d6cd62
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Aug 16 21:11:31 2024 +0200
patch 9.1.0679: Rename from w_closing to w_locked is incomplete
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 16 Aug 2024 21:15:16 +0200 |
| parents | ddf470823769 |
| children | 262defa9e7a7 |
| files | src/ex_cmds.c src/structs.h src/terminal.c src/version.c |
| diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2838,7 +2838,7 @@ do_ecmd( int did_decrement; 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. the_curwin->w_locked = TRUE; ++buf->b_locked;
--- a/src/structs.h +++ b/src/structs.h @@ -3785,8 +3785,7 @@ struct window_S synblock_T *w_s; // for :ownsyntax #endif - int w_locked; // window is being closed, don't let - // autocommands close it too. + int w_locked; // don't let autocommands close the window frame_T *w_frame; // frame containing this window
--- a/src/terminal.c +++ b/src/terminal.c @@ -3647,7 +3647,7 @@ term_after_channel_closed(term_T *term) if (term->tl_finish == TL_FINISH_CLOSE) { 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 win_T *pwin = NULL; @@ -3678,11 +3678,11 @@ term_after_channel_closed(term_T *term) { // Avoid closing the window if we temporarily use it. if (is_aucmd_win(curwin)) - do_set_w_closing = TRUE; - if (do_set_w_closing) + do_set_w_locked = TRUE; + if (do_set_w_locked) curwin->w_locked = TRUE; do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE); - if (do_set_w_closing) + if (do_set_w_locked) curwin->w_locked = FALSE; aucmd_restbuf(&aco); }