refactor: make commas trail in enums

12 files changed, 332 insertions, 333 deletions

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index ea49222a93..b3a08971e9 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -6216,8 +6216,8 @@ static void internal_format(int textwidth, int second_indent, int flags, int for
     open_line(FORWARD, OPENLINE_DELSPACES + OPENLINE_MARKFIX
               + (fo_white_par ? OPENLINE_KEEPTRAIL : 0)
               + (do_comments ? OPENLINE_DO_COM : 0)
-              + ((flags & INSCHAR_COM_LIST) ? OPENLINE_COM_LIST : 0)
-              , ((flags & INSCHAR_COM_LIST) ? second_indent : old_indent));
+              + ((flags & INSCHAR_COM_LIST) ? OPENLINE_COM_LIST : 0),
+              ((flags & INSCHAR_COM_LIST) ? second_indent : old_indent));
     if (!(flags & INSCHAR_COM_LIST)) {
       old_indent = 0;
     }
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index f649266b9f..b2e60c76d2 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -7501,8 +7501,8 @@ void do_exedit(exarg_T *eap, win_T *old_curwin)
                 // After a split we can use an existing buffer.
                 + (old_curwin != NULL ? ECMD_OLDBUF : 0)
                 + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0)
-                + (eap->cmdidx == CMD_balt ? ECMD_ALTBUF : 0)
-                , old_curwin == NULL ? curwin : NULL) == FAIL) {
+                + (eap->cmdidx == CMD_balt ? ECMD_ALTBUF : 0),
+                old_curwin == NULL ? curwin : NULL) == FAIL) {
       // Editing the file failed.  If the window was split, close it.
       if (old_curwin != NULL) {
         need_hide = (curbufIsChanged() && curbuf->b_nwindows <= 1);
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index 9eab579243..fca62353d5 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -642,8 +642,8 @@ char_u *vim_findfile(void *search_ctx_arg)
       if (stackp->ffs_filearray == NULL
           && ff_check_visited(&search_ctx->ffsc_dir_visited_list
                               ->ffvl_visited_list,
-                              stackp->ffs_fix_path
-                              , stackp->ffs_wc_path
+                              stackp->ffs_fix_path,
+                              stackp->ffs_wc_path
                               ) == FAIL) {
 #ifdef FF_VERBOSE
         if (p_verbose >= 5) {
@@ -840,15 +840,15 @@ char_u *vim_findfile(void *search_ctx_arg)
                                == os_isdir(file_path)))))
 #ifndef FF_VERBOSE
                   && (ff_check_visited(&search_ctx->ffsc_visited_list->ffvl_visited_list,
-                                       file_path
-                                       , (char_u *)""
+                                       file_path,
+                                       (char_u *)""
                                        ) == OK)
 #endif
                   ) {
 #ifdef FF_VERBOSE
                 if (ff_check_visited(&search_ctx->ffsc_visited_list->ffvl_visited_list,
-                                     file_path
-                                     , (char_u *)""
+                                     file_path,
+                                     (char_u *)""
                                      ) == FAIL) {
                   if (p_verbose >= 5) {
                     verbose_enter_scroll();
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index bd78818ab2..e4b4232337 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -3154,8 +3154,8 @@ nobackup:
                            O_WRONLY |
                            (append ?
                             (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
-                                     : (O_CREAT | O_TRUNC))
-                           , perm < 0 ? 0666 : (perm & 0777))) < 0) {
+                                     : (O_CREAT | O_TRUNC)),
+                           perm < 0 ? 0666 : (perm & 0777))) < 0) {
         // A forced write will try to create a new file if the old one
         // is still readonly. This may also happen when the directory
         // is read-only. In that case the mch_remove() will fail.
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 99e0bff81c..07bf03944d 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -2696,8 +2696,8 @@ int mch_print_begin(prt_settings_T *psettings)
     prt_dsc_resources(NULL, "encoding", buffer);
   }
   prt_dsc_requirements(prt_duplex, prt_tumble, prt_collate,
-                       psettings->do_syntax
-                       , prt_num_copies);
+                       psettings->do_syntax,
+                       prt_num_copies);
   prt_dsc_noarg("EndComments");
 
   /*
diff --git a/src/nvim/highlight_defs.h b/src/nvim/highlight_defs.h
index a0e8bad11f..12f2b62313 100644
--- a/src/nvim/highlight_defs.h
+++ b/src/nvim/highlight_defs.h
@@ -49,62 +49,61 @@ typedef struct attr_entry {
 /// Values for index in highlight_attr[].
 /// When making changes, also update hlf_names below!
 typedef enum {
-  HLF_8 = 0         // Meta & special keys listed with ":map", text that is
+  HLF_8 = 0,        // Meta & special keys listed with ":map", text that is
                     // displayed different from what it is
-  , HLF_EOB         // after the last line in the buffer
-  , HLF_TERM        // terminal cursor focused
-  , HLF_TERMNC      // terminal cursor unfocused
-  , HLF_AT          // @ characters at end of screen, characters that
-                    // don't really exist in the text
-  , HLF_D           // directories in CTRL-D listing
-  , HLF_E           // error messages
-  , HLF_I           // incremental search
-  , HLF_L           // last search string
-  , HLF_M           // "--More--" message
-  , HLF_CM          // Mode (e.g., "-- INSERT --")
-  , HLF_N           // line number for ":number" and ":#" commands
-  , HLF_LNA         // LineNrAbove
-  , HLF_LNB         // LineNrBelow
-  , HLF_CLN         // current line number when 'cursorline' is set
-  , HLF_R           // return to continue message and yes/no questions
-  , HLF_S           // status lines
-  , HLF_SNC         // status lines of not-current windows
-  , HLF_C           // column to separate vertically split windows
-  , HLF_T           // Titles for output from ":set all", ":autocmd" etc.
-  , HLF_V           // Visual mode
-  , HLF_VNC         // Visual mode, autoselecting and not clipboard owner
-  , HLF_W           // warning messages
-  , HLF_WM          // Wildmenu highlight
-  , HLF_FL          // Folded line
-  , HLF_FC          // Fold column
-  , HLF_ADD         // Added diff line
-  , HLF_CHD         // Changed diff line
-  , HLF_DED         // Deleted diff line
-  , HLF_TXD         // Text Changed in diff line
-  , HLF_SC          // Sign column
-  , HLF_CONCEAL     // Concealed text
-  , HLF_SPB         // SpellBad
-  , HLF_SPC         // SpellCap
-  , HLF_SPR         // SpellRare
-  , HLF_SPL         // SpellLocal
-  , HLF_PNI         // popup menu normal item
-  , HLF_PSI         // popup menu selected item
-  , HLF_PSB         // popup menu scrollbar
-  , HLF_PST         // popup menu scrollbar thumb
-  , HLF_TP          // tabpage line
-  , HLF_TPS         // tabpage line selected
-  , HLF_TPF         // tabpage line filler
-  , HLF_CUC         // 'cursorcolumn'
-  , HLF_CUL         // 'cursorline'
-  , HLF_MC          // 'colorcolumn'
-  , HLF_QFL         // selected quickfix line
-  , HLF_0           // Whitespace
-  , HLF_INACTIVE    // NormalNC: Normal text in non-current windows
-  , HLF_MSGSEP      // message separator line
-  , HLF_NFLOAT      // Floating window
-  , HLF_MSG         // Message area
-  , HLF_BORDER      // Floating window border
-  , HLF_COUNT       // MUST be the last one
+  HLF_EOB,        // after the last line in the buffer
+  HLF_TERM,       // terminal cursor focused
+  HLF_TERMNC,     // terminal cursor unfocused
+  HLF_AT,          // @ characters at end of screen, characters that don't really exist in the text
+  HLF_D,          // directories in CTRL-D listing
+  HLF_E,          // error messages
+  HLF_I,          // incremental search
+  HLF_L,          // last search string
+  HLF_M,          // "--More--" message
+  HLF_CM,         // Mode (e.g., "-- INSERT --")
+  HLF_N,          // line number for ":number" and ":#" commands
+  HLF_LNA,        // LineNrAbove
+  HLF_LNB,        // LineNrBelow
+  HLF_CLN,        // current line number when 'cursorline' is set
+  HLF_R,          // return to continue message and yes/no questions
+  HLF_S,          // status lines
+  HLF_SNC,        // status lines of not-current windows
+  HLF_C,          // column to separate vertically split windows
+  HLF_T,          // Titles for output from ":set all", ":autocmd" etc.
+  HLF_V,          // Visual mode
+  HLF_VNC,        // Visual mode, autoselecting and not clipboard owner
+  HLF_W,          // warning messages
+  HLF_WM,         // Wildmenu highlight
+  HLF_FL,         // Folded line
+  HLF_FC,         // Fold column
+  HLF_ADD,        // Added diff line
+  HLF_CHD,        // Changed diff line
+  HLF_DED,        // Deleted diff line
+  HLF_TXD,        // Text Changed in diff line
+  HLF_SC,         // Sign column
+  HLF_CONCEAL,    // Concealed text
+  HLF_SPB,        // SpellBad
+  HLF_SPC,        // SpellCap
+  HLF_SPR,        // SpellRare
+  HLF_SPL,        // SpellLocal
+  HLF_PNI,        // popup menu normal item
+  HLF_PSI,        // popup menu selected item
+  HLF_PSB,        // popup menu scrollbar
+  HLF_PST,        // popup menu scrollbar thumb
+  HLF_TP,         // tabpage line
+  HLF_TPS,        // tabpage line selected
+  HLF_TPF,        // tabpage line filler
+  HLF_CUC,        // 'cursorcolumn'
+  HLF_CUL,        // 'cursorline'
+  HLF_MC,         // 'colorcolumn'
+  HLF_QFL,        // selected quickfix line
+  HLF_0,          // Whitespace
+  HLF_INACTIVE,   // NormalNC: Normal text in non-current windows
+  HLF_MSGSEP,     // message separator line
+  HLF_NFLOAT,     // Floating window
+  HLF_MSG,        // Message area
+  HLF_BORDER,     // Floating window border
+  HLF_COUNT       // MUST be the last one
 } hlf_T;
 
 EXTERN const char *hlf_names[] INIT(= {
diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h
index f2de341976..663a7a12ec 100644
--- a/src/nvim/keymap.h
+++ b/src/nvim/keymap.h
@@ -122,130 +122,130 @@
 //
 // Entries must be in the range 0x02-0x7f (see comment at K_SPECIAL).
 enum key_extra {
-  KE_NAME = 3                 // name of this terminal entry
-
-  , KE_S_UP = 4               // shift-up
-  , KE_S_DOWN = 5             // shift-down
-
-  , KE_S_F1 = 6               // shifted function keys
-  , KE_S_F2 = 7
-  , KE_S_F3 = 8
-  , KE_S_F4 = 9
-  , KE_S_F5 = 10
-  , KE_S_F6 = 11
-  , KE_S_F7 = 12
-  , KE_S_F8 = 13
-  , KE_S_F9 = 14
-  , KE_S_F10 = 15
-
-  , KE_S_F11 = 16
-  , KE_S_F12 = 17
-  , KE_S_F13 = 18
-  , KE_S_F14 = 19
-  , KE_S_F15 = 20
-  , KE_S_F16 = 21
-  , KE_S_F17 = 22
-  , KE_S_F18 = 23
-  , KE_S_F19 = 24
-  , KE_S_F20 = 25
-
-  , KE_S_F21 = 26
-  , KE_S_F22 = 27
-  , KE_S_F23 = 28
-  , KE_S_F24 = 29
-  , KE_S_F25 = 30
-  , KE_S_F26 = 31
-  , KE_S_F27 = 32
-  , KE_S_F28 = 33
-  , KE_S_F29 = 34
-  , KE_S_F30 = 35
-
-  , KE_S_F31 = 36
-  , KE_S_F32 = 37
-  , KE_S_F33 = 38
-  , KE_S_F34 = 39
-  , KE_S_F35 = 40
-  , KE_S_F36 = 41
-  , KE_S_F37 = 42
-
-  , KE_MOUSE = 43             // mouse event start
-
-               // Symbols for pseudo keys which are translated from the real key symbols
-               // above.
-  , KE_LEFTMOUSE = 44         // Left mouse button click
-  , KE_LEFTDRAG = 45          // Drag with left mouse button down
-  , KE_LEFTRELEASE = 46       // Left mouse button release
-  , KE_MIDDLEMOUSE = 47       // Middle mouse button click
-  , KE_MIDDLEDRAG = 48        // Drag with middle mouse button down
-  , KE_MIDDLERELEASE = 49     // Middle mouse button release
-  , KE_RIGHTMOUSE = 50        // Right mouse button click
-  , KE_RIGHTDRAG = 51         // Drag with right mouse button down
-  , KE_RIGHTRELEASE = 52      // Right mouse button release
-
-  , KE_IGNORE = 53            // Ignored mouse drag/release
-
-  , KE_TAB = 54               // unshifted TAB key
-  , KE_S_TAB_OLD = 55         // shifted TAB key (no longer used)
-
-                   // , KE_SNIFF_UNUSED = 56   // obsolete
-  , KE_XF1 = 57               // extra vt100 function keys for xterm
-  , KE_XF2 = 58
-  , KE_XF3 = 59
-  , KE_XF4 = 60
-  , KE_XEND = 61              // extra (vt100) end key for xterm
-  , KE_ZEND = 62              // extra (vt100) end key for xterm
-  , KE_XHOME = 63             // extra (vt100) home key for xterm
-  , KE_ZHOME = 64             // extra (vt100) home key for xterm
-  , KE_XUP = 65               // extra vt100 cursor keys for xterm
-  , KE_XDOWN = 66
-  , KE_XLEFT = 67
-  , KE_XRIGHT = 68
-
-  , KE_LEFTMOUSE_NM = 69      // non-mappable Left mouse button click
-  , KE_LEFTRELEASE_NM = 70    // non-mappable left mouse button release
-
-  , KE_S_XF1 = 71             // vt100 shifted function keys for xterm
-  , KE_S_XF2 = 72
-  , KE_S_XF3 = 73
-  , KE_S_XF4 = 74
-
-               // NOTE: The scroll wheel events are inverted: i.e. UP is the same as
-               // moving the actual scroll wheel down, LEFT is the same as moving the
-               // scroll wheel right.
-  , KE_MOUSEDOWN = 75         // scroll wheel pseudo-button Down
-  , KE_MOUSEUP = 76           // scroll wheel pseudo-button Up
-  , KE_MOUSELEFT = 77         // scroll wheel pseudo-button Left
-  , KE_MOUSERIGHT = 78        // scroll wheel pseudo-button Right
-
-  , KE_KINS = 79              // keypad Insert key
-  , KE_KDEL = 80              // keypad Delete key
-
-  , KE_CSI = 81               // CSI typed directly
-  , KE_SNR = 82               // <SNR>
-  , KE_PLUG = 83              // <Plug>
-  , KE_CMDWIN = 84            // open command-line window from Command-line Mode
-
-  , KE_C_LEFT = 85            // control-left
-  , KE_C_RIGHT = 86           // control-right
-  , KE_C_HOME = 87            // control-home
-  , KE_C_END = 88             // control-end
-
-  , KE_X1MOUSE = 89           // X1/X2 mouse-buttons
-  , KE_X1DRAG = 90
-  , KE_X1RELEASE = 91
-  , KE_X2MOUSE = 92
-  , KE_X2DRAG = 93
-  , KE_X2RELEASE = 94
-
-  , KE_DROP = 95              // DnD data is available
-              // , KE_CURSORHOLD = 96     // CursorHold event
-  , KE_NOP = 97               // no-op: does nothing
-             // , KE_FOCUSGAINED = 98    // focus gained
-             // , KE_FOCUSLOST = 99      // focus lost
-  , KE_MOUSEMOVE = 100        // mouse moved with no button down
-                   // , KE_CANCEL = 101        // return from vgetc
-  , KE_EVENT = 102            // event
-  , KE_COMMAND = 104          // <Cmd> special key
+  KE_NAME = 3,                 // name of this terminal entry
+
+  KE_S_UP = 4,              // shift-up
+  KE_S_DOWN = 5,             // shift-down
+
+  KE_S_F1 = 6,              // shifted function keys
+  KE_S_F2 = 7,
+  KE_S_F3 = 8,
+  KE_S_F4 = 9,
+  KE_S_F5 = 10,
+  KE_S_F6 = 11,
+  KE_S_F7 = 12,
+  KE_S_F8 = 13,
+  KE_S_F9 = 14,
+  KE_S_F10 = 15,
+
+  KE_S_F11 = 16,
+  KE_S_F12 = 17,
+  KE_S_F13 = 18,
+  KE_S_F14 = 19,
+  KE_S_F15 = 20,
+  KE_S_F16 = 21,
+  KE_S_F17 = 22,
+  KE_S_F18 = 23,
+  KE_S_F19 = 24,
+  KE_S_F20 = 25,
+
+  KE_S_F21 = 26,
+  KE_S_F22 = 27,
+  KE_S_F23 = 28,
+  KE_S_F24 = 29,
+  KE_S_F25 = 30,
+  KE_S_F26 = 31,
+  KE_S_F27 = 32,
+  KE_S_F28 = 33,
+  KE_S_F29 = 34,
+  KE_S_F30 = 35,
+
+  KE_S_F31 = 36,
+  KE_S_F32 = 37,
+  KE_S_F33 = 38,
+  KE_S_F34 = 39,
+  KE_S_F35 = 40,
+  KE_S_F36 = 41,
+  KE_S_F37 = 42,
+
+  KE_MOUSE = 43,             // mouse event start
+
+  // Symbols for pseudo keys which are translated from the real key symbols
+  // above.
+  KE_LEFTMOUSE = 44,        // Left mouse button click
+  KE_LEFTDRAG = 45,         // Drag with left mouse button down
+  KE_LEFTRELEASE = 46,      // Left mouse button release
+  KE_MIDDLEMOUSE = 47,      // Middle mouse button click
+  KE_MIDDLEDRAG = 48,       // Drag with middle mouse button down
+  KE_MIDDLERELEASE = 49,    // Middle mouse button release
+  KE_RIGHTMOUSE = 50,       // Right mouse button click
+  KE_RIGHTDRAG = 51,        // Drag with right mouse button down
+  KE_RIGHTRELEASE = 52,      // Right mouse button release
+
+  KE_IGNORE = 53,            // Ignored mouse drag/release
+
+  KE_TAB = 54,              // unshifted TAB key
+  KE_S_TAB_OLD = 55,         // shifted TAB key (no longer used)
+
+  // , KE_SNIFF_UNUSED = 56   // obsolete
+  KE_XF1 = 57,              // extra vt100 function keys for xterm
+  KE_XF2 = 58,
+  KE_XF3 = 59,
+  KE_XF4 = 60,
+  KE_XEND = 61,             // extra (vt100) end key for xterm
+  KE_ZEND = 62,             // extra (vt100) end key for xterm
+  KE_XHOME = 63,            // extra (vt100) home key for xterm
+  KE_ZHOME = 64,            // extra (vt100) home key for xterm
+  KE_XUP = 65,              // extra vt100 cursor keys for xterm
+  KE_XDOWN = 66,
+  KE_XLEFT = 67,
+  KE_XRIGHT = 68,
+
+  KE_LEFTMOUSE_NM = 69,     // non-mappable Left mouse button click
+  KE_LEFTRELEASE_NM = 70,    // non-mappable left mouse button release
+
+  KE_S_XF1 = 71,            // vt100 shifted function keys for xterm
+  KE_S_XF2 = 72,
+  KE_S_XF3 = 73,
+  KE_S_XF4 = 74,
+
+  // NOTE: The scroll wheel events are inverted: i.e. UP is the same as
+  // moving the actual scroll wheel down, LEFT is the same as moving the
+  // scroll wheel right.
+  KE_MOUSEDOWN = 75,        // scroll wheel pseudo-button Down
+  KE_MOUSEUP = 76,          // scroll wheel pseudo-button Up
+  KE_MOUSELEFT = 77,        // scroll wheel pseudo-button Left
+  KE_MOUSERIGHT = 78,        // scroll wheel pseudo-button Right
+
+  KE_KINS = 79,             // keypad Insert key
+  KE_KDEL = 80,              // keypad Delete key
+
+  KE_CSI = 81,              // CSI typed directly
+  KE_SNR = 82,              // <SNR>
+  KE_PLUG = 83,             // <Plug>
+  KE_CMDWIN = 84,            // open command-line window from Command-line Mode
+
+  KE_C_LEFT = 85,           // control-left
+  KE_C_RIGHT = 86,          // control-right
+  KE_C_HOME = 87,           // control-home
+  KE_C_END = 88,             // control-end
+
+  KE_X1MOUSE = 89,          // X1/X2 mouse-buttons
+  KE_X1DRAG = 90,
+  KE_X1RELEASE = 91,
+  KE_X2MOUSE = 92,
+  KE_X2DRAG = 93,
+  KE_X2RELEASE = 94,
+
+  KE_DROP = 95,              // DnD data is available
+  // , KE_CURSORHOLD = 96     // CursorHold event
+  KE_NOP = 97,               // no-op: does nothing
+  // , KE_FOCUSGAINED = 98    // focus gained
+  // , KE_FOCUSLOST = 99      // focus lost
+  KE_MOUSEMOVE = 100,        // mouse moved with no button down
+  // , KE_CANCEL = 101        // return from vgetc
+  KE_EVENT = 102,           // event
+  KE_COMMAND = 104          // <Cmd> special key
 };
 
 /*
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 0874af5ee1..29e4a03d51 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -234,8 +234,8 @@ static linenr_T lowest_marked = 0;
 
 // argument for ml_upd_block0()
 typedef enum {
-  UB_FNAME = 0          // update timestamp and filename
-  , UB_SAME_DIR         // update the B0_SAME_DIR flag
+  UB_FNAME = 0,         // update timestamp and filename
+  UB_SAME_DIR         // update the B0_SAME_DIR flag
 } upd_block0_T;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 55c34586cb..bd8991e5f2 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -4324,8 +4324,8 @@ void format_lines(linenr_T line_count, int avoid_fex)
   } else {
     is_not_par = true;
   }
-  next_is_not_par = fmt_check_par(curwin->w_cursor.lnum
-                                  , &next_leader_len, &next_leader_flags, do_comments
+  next_is_not_par = fmt_check_par(curwin->w_cursor.lnum,
+                                  &next_leader_len, &next_leader_flags, do_comments
                                   );
   is_end_par = (is_not_par || next_is_not_par);
   if (!is_end_par && do_trail_white) {
@@ -4353,8 +4353,8 @@ void format_lines(linenr_T line_count, int avoid_fex)
       next_leader_len = 0;
       next_leader_flags = NULL;
     } else {
-      next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1
-                                      , &next_leader_len, &next_leader_flags, do_comments
+      next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1,
+                                      &next_leader_len, &next_leader_flags, do_comments
                                       );
       if (do_number_indent) {
         next_is_start_par =
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 2f931fed04..441d29cd9f 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -752,91 +752,91 @@ EXTERN int p_force_off;         ///< options that cannot be turned on.
 // b_p_scriptID[].
 //
 enum {
-  BV_AI = 0
-  , BV_AR
-  , BV_BH
-  , BV_BKC
-  , BV_BT
-  , BV_EFM
-  , BV_GP
-  , BV_MP
-  , BV_BIN
-  , BV_BL
-  , BV_BOMB
-  , BV_CHANNEL
-  , BV_CI
-  , BV_CIN
-  , BV_CINK
-  , BV_CINO
-  , BV_CINW
-  , BV_CM
-  , BV_CMS
-  , BV_COM
-  , BV_CPT
-  , BV_DICT
-  , BV_TSR
-  , BV_CSL
-  , BV_CFU
-  , BV_DEF
-  , BV_INC
-  , BV_EOL
-  , BV_FIXEOL
-  , BV_EP
-  , BV_ET
-  , BV_FENC
-  , BV_FP
-  , BV_BEXPR
-  , BV_FEX
-  , BV_FF
-  , BV_FLP
-  , BV_FO
-  , BV_FT
-  , BV_IMI
-  , BV_IMS
-  , BV_INDE
-  , BV_INDK
-  , BV_INEX
-  , BV_INF
-  , BV_ISK
-  , BV_KMAP
-  , BV_KP
-  , BV_LISP
-  , BV_LW
-  , BV_MENC
-  , BV_MA
-  , BV_ML
-  , BV_MOD
-  , BV_MPS
-  , BV_NF
-  , BV_OFU
-  , BV_PATH
-  , BV_PI
-  , BV_QE
-  , BV_RO
-  , BV_SCBK
-  , BV_SI
-  , BV_SMC
-  , BV_SYN
-  , BV_SPC
-  , BV_SPF
-  , BV_SPL
-  , BV_SPO
-  , BV_STS
-  , BV_SUA
-  , BV_SW
-  , BV_SWF
-  , BV_TFU
-  , BV_TAGS
-  , BV_TC
-  , BV_TS
-  , BV_TW
-  , BV_TX
-  , BV_UDF
-  , BV_UL
-  , BV_WM
-  , BV_VSTS
-  , BV_VTS
-  , BV_COUNT        // must be the last one
+  BV_AI = 0,
+  BV_AR,
+  BV_BH,
+  BV_BKC,
+  BV_BT,
+  BV_EFM,
+  BV_GP,
+  BV_MP,
+  BV_BIN,
+  BV_BL,
+  BV_BOMB,
+  BV_CHANNEL,
+  BV_CI,
+  BV_CIN,
+  BV_CINK,
+  BV_CINO,
+  BV_CINW,
+  BV_CM,
+  BV_CMS,
+  BV_COM,
+  BV_CPT,
+  BV_DICT,
+  BV_TSR,
+  BV_CSL,
+  BV_CFU,
+  BV_DEF,
+  BV_INC,
+  BV_EOL,
+  BV_FIXEOL,
+  BV_EP,
+  BV_ET,
+  BV_FENC,
+  BV_FP,
+  BV_BEXPR,
+  BV_FEX,
+  BV_FF,
+  BV_FLP,
+  BV_FO,
+  BV_FT,
+  BV_IMI,
+  BV_IMS,
+  BV_INDE,
+  BV_INDK,
+  BV_INEX,
+  BV_INF,
+  BV_ISK,
+  BV_KMAP,
+  BV_KP,
+  BV_LISP,
+  BV_LW,
+  BV_MENC,
+  BV_MA,
+  BV_ML,
+  BV_MOD,
+  BV_MPS,
+  BV_NF,
+  BV_OFU,
+  BV_PATH,
+  BV_PI,
+  BV_QE,
+  BV_RO,
+  BV_SCBK,
+  BV_SI,
+  BV_SMC,
+  BV_SYN,
+  BV_SPC,
+  BV_SPF,
+  BV_SPL,
+  BV_SPO,
+  BV_STS,
+  BV_SUA,
+  BV_SW,
+  BV_SWF,
+  BV_TFU,
+  BV_TAGS,
+  BV_TC,
+  BV_TS,
+  BV_TW,
+  BV_TX,
+  BV_UDF,
+  BV_UL,
+  BV_WM,
+  BV_VSTS,
+  BV_VTS,
+  BV_COUNT        // must be the last one
 };
 
 /*
@@ -845,51 +845,51 @@ enum {
  * window structure.
  */
 enum {
-  WV_LIST = 0
-  , WV_ARAB
-  , WV_COCU
-  , WV_COLE
-  , WV_CRBIND
-  , WV_BRI
-  , WV_BRIOPT
-  , WV_DIFF
-  , WV_FDC
-  , WV_FEN
-  , WV_FDI
-  , WV_FDL
-  , WV_FDM
-  , WV_FML
-  , WV_FDN
-  , WV_FDE
-  , WV_FDT
-  , WV_FMR
-  , WV_LBR
-  , WV_NU
-  , WV_RNU
-  , WV_NUW
-  , WV_PVW
-  , WV_RL
-  , WV_RLC
-  , WV_SCBIND
-  , WV_SCROLL
-  , WV_SISO
-  , WV_SO
-  , WV_SPELL
-  , WV_CUC
-  , WV_CUL
-  , WV_CULOPT
-  , WV_CC
-  , WV_SBR
-  , WV_STL
-  , WV_WFH
-  , WV_WFW
-  , WV_WRAP
-  , WV_SCL
-  , WV_WINHL
-  , WV_FCS
-  , WV_LCS
-  , WV_WINBL
-  , WV_COUNT        // must be the last one
+  WV_LIST = 0,
+  WV_ARAB,
+  WV_COCU,
+  WV_COLE,
+  WV_CRBIND,
+  WV_BRI,
+  WV_BRIOPT,
+  WV_DIFF,
+  WV_FDC,
+  WV_FEN,
+  WV_FDI,
+  WV_FDL,
+  WV_FDM,
+  WV_FML,
+  WV_FDN,
+  WV_FDE,
+  WV_FDT,
+  WV_FMR,
+  WV_LBR,
+  WV_NU,
+  WV_RNU,
+  WV_NUW,
+  WV_PVW,
+  WV_RL,
+  WV_RLC,
+  WV_SCBIND,
+  WV_SCROLL,
+  WV_SISO,
+  WV_SO,
+  WV_SPELL,
+  WV_CUC,
+  WV_CUL,
+  WV_CULOPT,
+  WV_CC,
+  WV_SBR,
+  WV_STL,
+  WV_WFH,
+  WV_WFW,
+  WV_WRAP,
+  WV_SCL,
+  WV_WINHL,
+  WV_FCS,
+  WV_LCS,
+  WV_WINBL,
+  WV_COUNT        // must be the last one
 };
 
 // Value for b_p_ul indicating the global value must be used.
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 83b06e2f6d..c22d344878 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -1402,8 +1402,8 @@ int find_tags(char_u *pat, int *num_matches, char_u ***matchesp, int flags, int
   int round;
   enum {
     TS_START,                   // at start of file
-    TS_LINEAR                   // linear searching forward, till EOF
-    , TS_BINARY,                // binary searching
+    TS_LINEAR,                  // linear searching forward, till EOF
+    TS_BINARY,                // binary searching
     TS_SKIP_BACK,               // skipping backwards
     TS_STEP_FORWARD             // stepping forwards
   }   state;                    // Current search state
diff --git a/src/uncrustify.cfg b/src/uncrustify.cfg
index 7dbaec7d67..bb2d675cb5 100644
--- a/src/uncrustify.cfg
+++ b/src/uncrustify.cfg
@@ -2346,7 +2346,7 @@ pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/
 pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_enum_comma                  = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of the comma in the base class list if there is more than one
 # line. Affects nl_class_init_args.
@@ -3307,5 +3307,5 @@ set QUESTION                     REAL_FATTR_CONST
 set QUESTION                     REAL_FATTR_NONNULL_ALL
 set QUESTION                     REAL_FATTR_PURE
 set QUESTION                     REAL_FATTR_WARN_UNUSED_RESULT
-# option(s) with 'not default' value: 64
+# option(s) with 'not default' value: 65
 #