4 files changed, 10 insertions, 9 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 30667b64e5..71ed5f6ec1 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1934,8 +1934,9 @@ void do_wqall(exarg_T *eap)
   int error = 0;
   int save_forceit = eap->forceit;
 
-  if (eap->cmdidx == CMD_xall || eap->cmdidx == CMD_wqall)
-    exiting = TRUE;
+  if (eap->cmdidx == CMD_xall || eap->cmdidx == CMD_wqall) {
+    exiting = true;
+  }
 
   FOR_ALL_BUFFERS(buf) {
     if (!bufIsChanged(buf)) {
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 0e8455bb07..a494463f89 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -6018,7 +6018,7 @@ static void ex_highlight(exarg_T *eap)
  */
 void not_exiting(void)
 {
-  exiting = FALSE;
+  exiting = false;
 }
 
 static bool before_quit_autocmds(win_T *wp, bool quit_all, int forceit)
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 4fce02613c..dbbc7cdafd 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -510,7 +510,7 @@ EXTERN int sc_col;              /* column for shown command */
 // First NO_SCREEN, then NO_BUFFERS, then 0 when startup finished.
 EXTERN int starting INIT(= NO_SCREEN);
 // true when planning to exit. Might keep running if there is a changed buffer.
-EXTERN int exiting INIT(= false);
+EXTERN bool exiting INIT(= false);
 // is stdin a terminal?
 EXTERN int stdin_isatty INIT(= true);
 // is stdout a terminal?
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 2c182abb96..55be97d3f4 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -584,9 +584,7 @@ int main(int argc, char **argv)
 void getout(int exitval)
   FUNC_ATTR_NORETURN
 {
-  tabpage_T   *tp, *next_tp;
-
-  exiting = TRUE;
+  exiting = true;
 
   /* When running in Ex mode an error causes us to exit with a non-zero exit
    * code.  POSIX requires this, although it's not 100% clear from the
@@ -603,8 +601,10 @@ void getout(int exitval)
   hash_debug_results();
 
   if (get_vim_var_nr(VV_DYING) <= 1) {
-    /* Trigger BufWinLeave for all windows, but only once per buffer. */
-    for (tp = first_tabpage; tp != NULL; tp = next_tp) {
+    const tabpage_T *next_tp;
+
+    // Trigger BufWinLeave for all windows, but only once per buffer.
+    for (const tabpage_T *tp = first_tabpage; tp != NULL; tp = next_tp) {
       next_tp = tp->tp_next;
       FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
         if (wp->w_buffer == NULL) {