*: Fix linter errors

4 files changed, 13 insertions, 15 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index cf55b42bdf..7c5b23f567 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2742,11 +2742,12 @@ void ex_call(exarg_T *eap)
    * call, and the loop is broken.
    */
   if (eap->skip) {
-    ++emsg_skip;
-    lnum = eap->line2;          /* do it once, also with an invalid range */
-  } else
+    emsg_skip++;
+    lnum = eap->line2;  // Do it once, also with an invalid range.
+  } else {
     lnum = eap->line1;
-  for (; lnum <= eap->line2; ++lnum) {
+  }
+  for (; lnum <= eap->line2; lnum++) {
     if (!eap->skip && eap->addr_count > 0) {  // -V560
       curwin->w_cursor.lnum = lnum;
       curwin->w_cursor.col = 0;
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 0e399c9fb3..17b3b512ef 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -4095,8 +4095,7 @@ int expand_filename(exarg_T *eap, char_u **cmdlinep, char_u **errormsgp)
       xpc.xp_context = EXPAND_FILES;
       if (p_wic)
         options += WILD_ICASE;
-      p = ExpandOne(&xpc, eap->arg, NULL,
-          options, WILD_EXPAND_FREE);
+      p = ExpandOne(&xpc, eap->arg, NULL, options, WILD_EXPAND_FREE);
       if (p == NULL) {
         return FAIL;
       }
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 9340a45f62..7f087dcd20 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2333,9 +2333,9 @@ do_mouse (
         if (regname == 0 && eval_has_provider("clipboard")) {
           regname = '*';
         }
-        if ((State & REPLACE_FLAG) && !yank_register_mline(regname))
+        if ((State & REPLACE_FLAG) && !yank_register_mline(regname)) {
           insert_reg(regname, true);
-        else {
+        } else {
           do_put(regname, NULL, BACKWARD, 1L,
                  (fixindent ? PUT_FIXINDENT : 0) | PUT_CURSEND);
 
@@ -7616,7 +7616,7 @@ static void nv_record(cmdarg_T *cap)
     } else {
       // (stop) recording into a named register, unless executing a
       // register.
-      if (!Exec_reg && do_record(cap->nchar) == false) {
+      if (!Exec_reg && do_record(cap->nchar) == FAIL) {
         clearopbeep(cap->oap);
       }
     }
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 66b52c3b25..a8993be4e5 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -1017,11 +1017,9 @@ static void win_update(win_T *wp)
 
     if (VIsual_active) {
       if (VIsual_mode != wp->w_old_visual_mode || type == INVERTED_ALL) {
-        /*
-         * If the type of Visual selection changed, redraw the whole
-         * selection.  Also when the ownership of the X selection is
-         * gained or lost.
-         */
+        // If the type of Visual selection changed, redraw the whole
+        // selection.  Also when the ownership of the X selection is
+        // gained or lost.
         if (curwin->w_cursor.lnum < VIsual.lnum) {
           from = curwin->w_cursor.lnum;
           to = VIsual.lnum;
@@ -5349,7 +5347,7 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
           nc1 = NUL;
         } else {
           nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
-              (int)((text + len) - ptr - mbyte_blen));
+                                 (int)((text + len) - ptr - mbyte_blen));
           nc1 = pcc[0];
         }
         pc = prev_c;