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>

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 349269a2bb8b69635aeddb4e97aa8779cf33ad30..b2aaf1cab9b2864540f5e82a1ba83ac7dfac9ab6 100644 (file)
--- 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;

diff --git a/src/structs.h b/src/structs.h
index abda3a0c38b4eaf5cf3f9d0dc77d44ea0fc53db4..847972f5a8b8ce4a6fbc759b9f2e464333565029 100644 (file)
--- 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
 

diff --git a/src/terminal.c b/src/terminal.c
index f80196096df49e29b08250c376ad3fbbfc599d93..073f8dd48da44ae17c9904d06fd6f51b332933e9 100644 (file)
--- 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);
            }

diff --git a/src/version.c b/src/version.c
index 08b3fafd7b4527bc15bf3083b4bb7055a46bb8f8..798e5584570402faf3cf86c8925b249803252c6e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    679,
 /**/
     678,
 /**/