3 files changed, 15 insertions, 17 deletions
diff --git a/src/nvim/eval/typval_encode.c.h b/src/nvim/eval/typval_encode.c.h
index 623bdfc93b..289c3ee99c 100644
--- a/src/nvim/eval/typval_encode.c.h
+++ b/src/nvim/eval/typval_encode.c.h
@@ -382,7 +382,7 @@ static int _TYPVAL_ENCODE_CONVERT_ONE_VALUE(
     case VAR_SPECIAL: {
       switch (tv->vval.v_special) {
         case kSpecialVarNull: {
-          TYPVAL_ENCODE_CONV_NIL(tv);
+          TYPVAL_ENCODE_CONV_NIL(tv);  // -V1037
           break;
         }
         case kSpecialVarTrue:
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 3f768dcc0c..18b0bf3c16 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -384,10 +384,7 @@ void msgpack_rpc_from_object(const Object result, msgpack_packer *const res)
                   && kObjectTypeTabpage == kObjectTypeWindow + 1,
                   "Buffer, window and tabpage enum items are in order");
     switch (cur.aobj->type) {
-      case kObjectTypeNil: {
-        msgpack_pack_nil(res);
-        break;
-      }
+      case kObjectTypeNil:
       case kObjectTypeLuaRef: {
         // TODO(bfredl): could also be an error. Though kObjectTypeLuaRef
         // should only appear when the caller has opted in to handle references,
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index a28e05bd7e..a8919560a0 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -1263,8 +1263,8 @@ static int nfa_regatom(void)
       IEMSGN("INTERNAL: Unknown character class char: %" PRId64, c);
       return FAIL;
     }
-    /* When '.' is followed by a composing char ignore the dot, so that
-     * the composing char is matched here. */
+    // When '.' is followed by a composing char ignore the dot, so that
+    // the composing char is matched here.
     if (enc_utf8 && c == Magic('.') && utf_iscomposing(peekchr())) {
       old_regparse = regparse;
       c = getchr();
@@ -1279,25 +1279,26 @@ static int nfa_regatom(void)
     break;
 
   case Magic('n'):
-    if (reg_string)
-      /* In a string "\n" matches a newline character. */
+    if (reg_string) {
+      // In a string "\n" matches a newline character.
       EMIT(NL);
-    else {
-      /* In buffer text "\n" matches the end of a line. */
+    } else {
+      // In buffer text "\n" matches the end of a line.
       EMIT(NFA_NEWL);
       regflags |= RF_HASNL;
     }
     break;
 
   case Magic('('):
-    if (nfa_reg(REG_PAREN) == FAIL)
-      return FAIL;                  /* cascaded error */
+    if (nfa_reg(REG_PAREN) == FAIL) {
+      return FAIL;                  // cascaded error
+    }
     break;
 
   case Magic('|'):
   case Magic('&'):
   case Magic(')'):
-    EMSGN(_(e_misplaced), no_Magic(c));
+    EMSGN(_(e_misplaced), no_Magic(c));  // -V1037
     return FAIL;
 
   case Magic('='):
@@ -1306,7 +1307,7 @@ static int nfa_regatom(void)
   case Magic('@'):
   case Magic('*'):
   case Magic('{'):
-    /* these should follow an atom, not form an atom */
+    // these should follow an atom, not form an atom
     EMSGN(_(e_misplaced), no_Magic(c));
     return FAIL;
 
@@ -1314,8 +1315,8 @@ static int nfa_regatom(void)
   {
     char_u      *lp;
 
-    /* Previous substitute pattern.
-     * Generated as "\%(pattern\)". */
+    // Previous substitute pattern.
+    // Generated as "\%(pattern\)".
     if (reg_prev_sub == NULL) {
       EMSG(_(e_nopresub));
       return FAIL;