6 files changed, 6 insertions, 8 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 85ab51da5d..f50b355045 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -91,13 +91,11 @@ typedef enum {
 #  pragma function(floor)
 # endif
 
-// uncrustify:off
 PRAGMA_DIAG_PUSH_IGNORE_MISSING_PROTOTYPES
 PRAGMA_DIAG_PUSH_IGNORE_IMPLICIT_FALLTHROUGH
 # include "funcs.generated.h"
 PRAGMA_DIAG_POP
 PRAGMA_DIAG_POP
-// uncrustify:on
 #endif
 
 static char *e_listblobarg = N_("E899: Argument of %s must be a List or Blob");
diff --git a/src/nvim/eval/typval_encode.c.h b/src/nvim/eval/typval_encode.c.h
index 8c952473a1..73b36b8611 100644
--- a/src/nvim/eval/typval_encode.c.h
+++ b/src/nvim/eval/typval_encode.c.h
@@ -1,3 +1,5 @@
+// uncrustify:off
+
 /// @file eval/typval_encode.c.h
 ///
 /// Contains set of macros used to convert (possibly recursive) typval_T into
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 33ae1dbad0..9ba55befdd 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -4886,13 +4886,11 @@ int buf_check_timestamp(buf_T *buf)
   char *mesg2 = "";
   bool helpmesg = false;
 
-  // uncrustify:off
   enum {
     RELOAD_NONE,
     RELOAD_NORMAL,
-    RELOAD_DETECT
+    RELOAD_DETECT,
   } reload = RELOAD_NONE;
-  // uncrustify:on
 
   bool can_reload = false;
   uint64_t orig_size = buf->b_orig_size;
diff --git a/src/nvim/func_attr.h b/src/nvim/func_attr.h
index afbd87f2be..6c049df6ff 100644
--- a/src/nvim/func_attr.h
+++ b/src/nvim/func_attr.h
@@ -113,7 +113,7 @@
 // void myfunc(void) REAL_FATTR_ALWAYS_INLINE;
 #  define REAL_FATTR_MALLOC __attribute__((malloc))
 #  define REAL_FATTR_ALLOC_ALIGN(x) __attribute__((alloc_align(x)))
-#  define REAL_FATTR_PURE __attribute__ ((pure))
+#  define REAL_FATTR_PURE __attribute__((pure))
 #  define REAL_FATTR_CONST __attribute__((const))
 #  define REAL_FATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
 #  define REAL_FATTR_ALWAYS_INLINE __attribute__((always_inline))
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 43fa7a0dd7..ce47e0add6 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -3,7 +3,7 @@
 
 // for debugging
 // #define CHECK(c, s) do { if (c) emsg(s); } while (0)
-#define CHECK(c, s) do { } while (0)
+#define CHECK(c, s) do {} while (0)
 
 /*
  * memline.c: Contains the functions for appending, deleting and changing the
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 1ca403965c..aeb85eba1c 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -1022,7 +1022,7 @@ static int normal_execute(VimState *state, int key)
 
   s->need_flushbuf = add_to_showcmd(s->c);
 
-  while (normal_get_command_count(s)) { }
+  while (normal_get_command_count(s)) {}
 
   if (s->c == K_EVENT) {
     // Save the count values so that ca.opcount and ca.count0 are exactly