build: update uncrustify to 0.76

13 files changed, 196 insertions, 87 deletions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7e2b981690..3cb07b0da7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
     timeout-minutes: 10
     env:
       CACHE_UNCRUSTIFY: ${{ github.workspace }}/.cache/uncrustify
-      UNCRUSTIFY_VERSION: uncrustify-0.75.0
+      UNCRUSTIFY_VERSION: uncrustify-0.76.0
     steps:
       - uses: actions/checkout@v3
 
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index edf13b073c..bd3482c85f 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -254,7 +254,8 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
 
 // TODO(bfredl): use me to detach a specific ui from the server
 void remote_ui_stop(UI *ui)
-{}
+{
+}
 
 void nvim_ui_try_resize(uint64_t channel_id, Integer width, Integer height, Error *err)
   FUNC_API_SINCE(1) FUNC_API_REMOTE_ONLY
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index d9226214c6..d903d498e7 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -2265,7 +2265,8 @@ static void f_fnamemodify(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 
 /// "foreground()" function
 static void f_foreground(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
-{}
+{
+}
 
 static void f_funcref(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 {
@@ -2941,7 +2942,8 @@ static void f_gettagstack(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 
 /// Dummy timer callback. Used by f_wait().
 static void dummy_timer_due_cb(TimeWatcher *tw, void *data)
-{}
+{
+}
 
 /// Dummy timer close callback. Used by f_wait().
 static void dummy_timer_close_cb(TimeWatcher *tw, void *data)
diff --git a/src/nvim/log.c b/src/nvim/log.c
index 4de0c4d88c..afe3d95e9a 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -131,7 +131,7 @@ void log_unlock(void)
 /// @return true if log was emitted normally, false if failed or recursive
 bool logmsg(int log_level, const char *context, const char *func_name, int line_num, bool eol,
             const char *fmt, ...)
-  FUNC_ATTR_UNUSED FUNC_ATTR_PRINTF(6, 7)
+  FUNC_ATTR_PRINTF(6, 7)
 {
   static bool recursive = false;
   static bool did_msg = false;  // Showed recursion message?
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index 3646fd876b..13a0c4b0cd 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -377,7 +377,8 @@ static int nlua_schedule(lua_State *const lstate)
 
 // Dummy timer callback. Used by f_wait().
 static void dummy_timer_due_cb(TimeWatcher *tw, void *data)
-{}
+{
+}
 
 // Dummy timer close callback. Used by f_wait().
 static void dummy_timer_close_cb(TimeWatcher *tw, void *data)
diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 242e3c381a..57cb298572 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -91,7 +91,7 @@
 # define MCH_OPEN_RW(n, f)      os_open((n), (f), 0)
 #endif
 
-#define REPLACE_NORMAL(s) (((s) & REPLACE_FLAG) && !((s) & VREPLACE_FLAG))
+#define REPLACE_NORMAL(s) (((s)& REPLACE_FLAG) && !((s)& VREPLACE_FLAG))
 
 // MB_PTR_ADV(): advance a pointer to the next character, taking care of
 // multi-byte characters if needed. Skip over composing chars.
diff --git a/src/nvim/msgpack_rpc/unpacker.c b/src/nvim/msgpack_rpc/unpacker.c
index 44a16beb48..25edf2e21d 100644
--- a/src/nvim/msgpack_rpc/unpacker.c
+++ b/src/nvim/msgpack_rpc/unpacker.c
@@ -179,7 +179,8 @@ static void api_parse_enter(mpack_parser_t *parser, mpack_node_t *node)
 }
 
 static void api_parse_exit(mpack_parser_t *parser, mpack_node_t *node)
-{}
+{
+}
 
 void unpacker_init(Unpacker *p)
 {
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 5fcdf5d4c1..2bafeccba4 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2180,7 +2180,8 @@ static void nv_ignore(cmdarg_T *cap)
 /// Command character that doesn't do anything, but unlike nv_ignore() does
 /// start edit().  Used for "startinsert" executed while starting up.
 static void nv_nop(cmdarg_T *cap)
-{}
+{
+}
 
 /// Command character doesn't exist.
 static void nv_error(cmdarg_T *cap)
diff --git a/src/nvim/os/os_defs.h b/src/nvim/os/os_defs.h
index 9e201f1dfa..c595013a21 100644
--- a/src/nvim/os/os_defs.h
+++ b/src/nvim/os/os_defs.h
@@ -57,49 +57,49 @@
 // stat macros
 #ifndef S_ISDIR
 # ifdef S_IFDIR
-#  define S_ISDIR(m)    (((m) & S_IFMT) == S_IFDIR)
+#  define S_ISDIR(m)    (((m)& S_IFMT) == S_IFDIR)
 # else
 #  define S_ISDIR(m)    0
 # endif
 #endif
 #ifndef S_ISREG
 # ifdef S_IFREG
-#  define S_ISREG(m)    (((m) & S_IFMT) == S_IFREG)
+#  define S_ISREG(m)    (((m)& S_IFMT) == S_IFREG)
 # else
 #  define S_ISREG(m)    0
 # endif
 #endif
 #ifndef S_ISBLK
 # ifdef S_IFBLK
-#  define S_ISBLK(m)    (((m) & S_IFMT) == S_IFBLK)
+#  define S_ISBLK(m)    (((m)& S_IFMT) == S_IFBLK)
 # else
 #  define S_ISBLK(m)    0
 # endif
 #endif
 #ifndef S_ISSOCK
 # ifdef S_IFSOCK
-#  define S_ISSOCK(m)   (((m) & S_IFMT) == S_IFSOCK)
+#  define S_ISSOCK(m)   (((m)& S_IFMT) == S_IFSOCK)
 # else
 #  define S_ISSOCK(m)   0
 # endif
 #endif
 #ifndef S_ISFIFO
 # ifdef S_IFIFO
-#  define S_ISFIFO(m)   (((m) & S_IFMT) == S_IFIFO)
+#  define S_ISFIFO(m)   (((m)& S_IFMT) == S_IFIFO)
 # else
 #  define S_ISFIFO(m)   0
 # endif
 #endif
 #ifndef S_ISCHR
 # ifdef S_IFCHR
-#  define S_ISCHR(m)    (((m) & S_IFMT) == S_IFCHR)
+#  define S_ISCHR(m)    (((m)& S_IFMT) == S_IFCHR)
 # else
 #  define S_ISCHR(m)    0
 # endif
 #endif
 #ifndef S_ISLNK
 # ifdef S_IFLNK
-#  define S_ISLNK(m)    (((m) & S_IFMT) == S_IFLNK)
+#  define S_ISLNK(m)    (((m)& S_IFMT) == S_IFLNK)
 # else
 #  define S_ISLNK(m)    0
 # endif
diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c
index 6233a90638..2e850f8c22 100644
--- a/src/nvim/os/pty_process_win.c
+++ b/src/nvim/os/pty_process_win.c
@@ -172,11 +172,13 @@ void pty_process_close(PtyProcess *ptyproc)
 
 void pty_process_close_master(PtyProcess *ptyproc)
   FUNC_ATTR_NONNULL_ALL
-{}
+{
+}
 
 void pty_process_teardown(Loop *loop)
   FUNC_ATTR_NONNULL_ALL
-{}
+{
+}
 
 static void pty_process_connect_cb(uv_connect_t *req, int status)
   FUNC_ATTR_NONNULL_ALL
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index a3e5640b18..64a2e0bb61 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -302,7 +302,8 @@ void init_chartabsize_arg(chartabsize_T *cts, win_T *wp, linenr_T lnum FUNC_ATTR
 
 /// Free any allocated item in "cts".
 void clear_chartabsize_arg(chartabsize_T *cts)
-{}
+{
+}
 
 /// like win_chartabsize(), but also check for line breaks on the screen
 ///
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index df7c87ad60..eecaa8c55a 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1369,7 +1369,8 @@ void tui_set_title(TUIData *tui, String title)
 }
 
 void tui_set_icon(TUIData *tui, String icon)
-{}
+{
+}
 
 void tui_screenshot(TUIData *tui, String path)
 {
diff --git a/src/uncrustify.cfg b/src/uncrustify.cfg
index 9c6b6bac6c..83b63dbdf6 100644
--- a/src/uncrustify.cfg
+++ b/src/uncrustify.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.75.1_f
+# Uncrustify-0.76.0_f
 
 #
 # General options
@@ -447,15 +447,15 @@ sp_after_comma                  = add      # ignore/add/remove/force/not_defined
 # Default: remove
 sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
 # like 'int[,,]'.
 sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
+# (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
 # like 'int[,,]'.
 sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
 
-# (C#) Add or remove space between ',' in multidimensional array type
+# (C#, Vala) Add or remove space between ',' in multidimensional array type
 # like 'int[,,]'.
 sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 
@@ -497,7 +497,7 @@ sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
 sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space after class ':'.
-sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
+sp_after_class_colon            = remove   # ignore/add/remove/force/not_defined
 
 # Add or remove space before class ':'.
 sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
@@ -816,7 +816,7 @@ sp_inv                          = remove   # ignore/add/remove/force/not_defined
 # affect the spacing after a '&' that is part of a type.
 #
 # Default: remove
-sp_addr                         = remove   # ignore/add/remove/force/not_defined
+sp_addr                         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around the '.' or '->' operators.
 #
@@ -995,7 +995,7 @@ sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between ')' and type in 'new(foo) BAR'.
 sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
 
-# Add or remove space inside parenthesis of the new operator
+# Add or remove space inside parentheses of the new operator
 # as in 'new(foo) BAR'.
 sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
 
@@ -1162,7 +1162,7 @@ indent_extern                   = false    # true/false
 indent_class                    = false    # true/false
 
 # Whether to ignore indent for the leading base class colon.
-indent_ignore_before_class_colon = false    # true/false
+indent_ignore_before_class_colon = true     # true/false
 
 # Additional indent before the leading base class colon.
 # Negative values decrease indent down to the first column.
@@ -1344,7 +1344,7 @@ indent_col1_multi_string_literal = false    # true/false
 indent_comment_align_thresh     = 3        # unsigned number
 
 # Whether to ignore indent for goto labels.
-indent_ignore_label             = false    # true/false
+indent_ignore_label             = true     # true/false
 
 # How to indent goto labels. Requires indent_ignore_label=false.
 #
@@ -1537,7 +1537,7 @@ indent_using_block              = true     # true/false
 # How to indent the continuation of ternary operator.
 #
 # 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
+# 1: When the `if_false` is a continuation, indent it under the `if_true` branch
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
@@ -1565,10 +1565,15 @@ donot_indent_func_def_close_paren = false    # true/false
 # Newline adding and removing options
 #
 
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
+# Whether to collapse empty blocks between '{' and '}' except for functions.
+# Use nl_collapse_empty_body_functions to specify how empty function braces
+# should be formatted.
 nl_collapse_empty_body          = true     # true/false
 
+# Whether to collapse empty blocks between '{' and '}' for functions only.
+# If true, overrides nl_inside_empty_func.
+nl_collapse_empty_body_functions = false    # true/false
+
 # Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
 nl_assign_leave_one_liners      = false    # true/false
 
@@ -2021,6 +2026,12 @@ nl_template_end                 = false    # true/false
 # See nl_oc_msg_leave_one_liner.
 nl_oc_msg_args                  = false    # true/false
 
+# (OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.
+nl_oc_msg_args_min_params       = 0        # unsigned number
+
+# (OC) Max code width of Objective-C message before applying nl_oc_msg_args.
+nl_oc_msg_args_max_code_width   = 0        # unsigned number
+
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = force    # ignore/add/remove/force/not_defined
 
@@ -2034,6 +2045,9 @@ nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove newline between 'return' and the return expression.
 nl_return_expr                  = remove   # ignore/add/remove/force/not_defined
 
+# Add or remove newline between 'throw' and the throw expression.
+nl_throw_expr                   = ignore   # ignore/add/remove/force/not_defined
+
 # Whether to add a newline after semicolons, except in 'for' statements.
 nl_after_semicolon              = false    # true/false
 
@@ -2227,7 +2241,7 @@ nl_max_blank_in_func            = 0        # unsigned number
 # The number of newlines inside an empty function body.
 # This option overrides eat_blanks_after_open_brace and
 # eat_blanks_before_close_brace, but is ignored when
-# nl_collapse_empty_body=true
+# nl_collapse_empty_body_functions=true
 nl_inside_empty_func            = 0        # unsigned number
 
 # The number of newlines before a function prototype.
@@ -2279,12 +2293,6 @@ nl_after_func_body_class        = 0        # unsigned number
 # Overrides nl_after_func_body and nl_after_func_body_class.
 nl_after_func_body_one_liner    = 0        # unsigned number
 
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
 # The number of newlines before a block of typedefs. If nl_after_access_spec
 # is non-zero, that option takes precedence.
 #
@@ -2301,15 +2309,27 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of empty newlines before a block of variable definitions
+# The minimum number of blank lines after a block of variable definitions
+# at the top of a function body. If any preprocessor directives appear
+# between the opening brace of the function and the variable block, then
+# it is considered as not at the top of the function.Newlines are added
+# before trailing preprocessor directives, if any exist.
+#
+# 0: No change (default).
+nl_var_def_blk_end_func_top     = 0        # unsigned number
+
+# The minimum number of empty newlines before a block of variable definitions
 # not at the top of a function body. If nl_after_access_spec is non-zero,
-# that option takes precedence.
+# that option takes precedence. Newlines are not added at the top of the
+# file or just after an opening brace. Newlines are added above any
+# preprocessor directives before the block.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of empty newlines after a block of variable definitions
-# not at the top of a function body.
+# The minimum number of empty newlines after a block of variable definitions
+# not at the top of a function body. Newlines are not added if the block
+# is at the bottom of the file or just before a preprocessor directive.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2625,11 +2645,6 @@ align_var_def_inline            = false    # true/false
 # 0: Don't align (default).
 align_assign_span               = 0        # unsigned number
 
-# The span for aligning on '{' in braced init list.
-#
-# 0: Don't align (default).
-align_braced_init_list_span     = 0        # unsigned number
-
 # The span for aligning on '=' in function prototype modifier.
 #
 # 0: Don't align (default).
@@ -2646,6 +2661,11 @@ align_assign_thresh             = 0        # number
 # Depends on 'align_assign_span' and 'align_assign_thresh' settings.
 align_assign_on_multi_var_defs  = false    # true/false
 
+# The span for aligning on '{' in braced init list.
+#
+# 0: Don't align (default).
+align_braced_init_list_span     = 0        # unsigned number
+
 # The threshold for aligning on '{' in braced init list.
 # Use a negative number for absolute thresholds.
 #
@@ -3099,9 +3119,12 @@ mod_full_brace_nl               = 0        # unsigned number
 #   mod_full_brace_function
 mod_full_brace_nl_block_rem_mlcond = false    # true/false
 
-# Add or remove unnecessary parenthesis on 'return' statement.
+# Add or remove unnecessary parentheses on 'return' statement.
 mod_paren_on_return             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove unnecessary parentheses on 'throw' statement.
+mod_paren_on_throw              = ignore   # ignore/add/remove/force/not_defined
+
 # (Pawn) Whether to change optional semicolons to real semicolons.
 mod_pawn_semicolon              = false    # true/false
 
@@ -3190,7 +3213,7 @@ mod_move_case_return            = false    # true/false
 
 # Add or remove braces around a fully braced case statement. Will only remove
 # braces if there are no variable declarations in the block.
-mod_case_brace                  = remove   # ignore/add/remove/force/not_defined
+mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to remove a void 'return;' that appears as the last statement in a
 # function.
@@ -3199,6 +3222,49 @@ mod_remove_empty_return         = false    # true/false
 # Add or remove the comma after the last value of an enumeration.
 mod_enum_last_comma             = add      # ignore/add/remove/force/not_defined
 
+# Syntax to use for infinite loops.
+#
+# 0: Leave syntax alone (default)
+# 1: Rewrite as `for(;;)`
+# 2: Rewrite as `while(true)`
+# 3: Rewrite as `do`...`while(true);`
+# 4: Rewrite as `while(1)`
+# 5: Rewrite as `do`...`while(1);`
+#
+# Infinite loops that do not already match one of these syntaxes are ignored.
+# Other options that affect loop formatting will be applied after transforming
+# the syntax.
+mod_infinite_loop               = 0        # unsigned number
+
+# Add or remove the 'int' keyword in 'int short'.
+mod_int_short                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'short int'.
+mod_short_int                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int long'.
+mod_int_long                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'long int'.
+mod_long_int                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int signed'.
+mod_int_signed                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'signed int'.
+mod_signed_int                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int unsigned'.
+mod_int_unsigned                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'unsigned int'.
+mod_unsigned_int                = ignore   # ignore/add/remove/force/not_defined
+
+# If there is a situation where mod_int_* and mod_*_int would result in
+# multiple int keywords, whether to keep the rightmost int (the default) or the
+# leftmost int.
+mod_int_prefer_int_on_left      = false    # true/false
+
 # (OC) Whether to organize the properties. If true, properties will be
 # rearranged according to the mod_sort_oc_property_*_weight factors.
 mod_sort_oc_properties          = false    # true/false
@@ -3230,6 +3296,16 @@ mod_sort_oc_property_nullability_weight = 0        # number
 # Preprocessor options
 #
 
+# How to use tabs when indenting preprocessor code.
+#
+# -1: Use 'indent_with_tabs' setting (default)
+#  0: Spaces only
+#  1: Indent with tabs to brace level, align with spaces
+#  2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: -1
+pp_indent_with_tabs             = -1       # number
+
 # Add or remove indentation of preprocessor directives inside #if blocks
 # at brace level 0 (file-level).
 pp_indent                       = remove   # ignore/add/remove/force/not_defined
@@ -3250,11 +3326,11 @@ pp_indent_at_level0             = false    # true/false
 # Default: 1
 pp_indent_count                 = 1        # unsigned number
 
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = force    # ignore/add/remove/force/not_defined
+# Add or remove space after # based on pp level of #if blocks.
+pp_space_after                  = force    # ignore/add/remove/force/not_defined
 
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
+# Sets the number of spaces per level added with pp_space_after.
+pp_space_count                  = 1        # unsigned number
 
 # The indent for '#region' and '#endregion' in C# and '#pragma region' in
 # C/C++. Negative values decrease indent down to the first column.
@@ -3286,22 +3362,34 @@ pp_include_at_level             = false    # true/false
 # Whether to ignore the '#define' body while formatting.
 pp_ignore_define_body           = false    # true/false
 
+# An offset value that controls the indentation of the body of a multiline #define.
+# 'body' refers to all the lines of a multiline #define except the first line.
+# Requires 'pp_ignore_define_body = false'.
+#
+#  <0: Absolute column: the body indentation starts off at the specified column
+#      (ex. -3 ==> the body is indented starting from column 3)
+# >=0: Relative to the column of the '#' of '#define'
+#      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
+#
+# Default: 8
+pp_multiline_define_body_indent = 2        # number
+
 # Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
+# Only applies to the indent of the preprocessor that the case statements
 # directly inside of.
 #
 # Default: true
 pp_indent_case                  = true     # true/false
 
 # Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
+# Only applies to the indent of the preprocessor that the function definition
 # is directly inside of.
 #
 # Default: true
 pp_indent_func_def              = true     # true/false
 
 # Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
+# Only applies to the indent of the preprocessor that the extern block is
 # directly inside of.
 #
 # Default: true
@@ -3309,7 +3397,7 @@ pp_indent_extern                = true     # true/false
 
 # How to indent braces directly inside #if, #else, and #endif.
 # Requires pp_if_indent_code=true and only applies to the indent of the
-# preprocesser that the braces are directly inside of.
+# preprocessor that the braces are directly inside of.
 #  0: No extra indent
 #  1: Indent by one level
 # -1: Preserve original indentation
@@ -3382,10 +3470,10 @@ use_indent_continue_only_once   = false    # true/false
 
 # The indentation can be:
 # - after the assignment, at the '[' character
-# - at the begin of the lambda body
+# - at the beginning of the lambda body
 #
-# true:  indentation will be after the assignment
-# false: indentation will be at the begin of the lambda body (default)
+# true:  indentation will be at the beginning of the lambda body
+# false: indentation will be after the assignment (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
@@ -3437,6 +3525,18 @@ debug_timeout                   = 0        # number
 # 0: do not truncate.
 debug_truncate                  = 0        # unsigned number
 
+# sort (or not) the tracking info.
+#
+# Default: true
+debug_sort_the_tracks           = true     # true/false
+
+# decode (or not) the flags as a new line.
+# only if the -p option is set.
+debug_decode_the_flags          = false    # true/false
+
+# insert the number of the line at the beginning of each line
+set_numbering_for_html_output   = false    # true/false
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
@@ -3489,32 +3589,31 @@ debug_truncate                  = 0        # unsigned number
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-set QUESTION                     FUNC_API_CHECK_TEXTLOCK
-set QUESTION                     FUNC_API_DEPRECATED_SINCE
-set QUESTION                     FUNC_API_FAST
-set QUESTION                     FUNC_API_LUA_ONLY
-set QUESTION                     FUNC_API_NOEXPORT
-set QUESTION                     FUNC_API_REMOTE_ONLY
-set QUESTION                     FUNC_API_SINCE
-set QUESTION                     FUNC_ATTR_ALWAYS_INLINE
-set QUESTION                     FUNC_ATTR_CONST
-set QUESTION                     FUNC_ATTR_MALLOC
-set QUESTION                     FUNC_ATTR_NONNULL_ALL
-set QUESTION                     FUNC_ATTR_NONNULL_ARG
-set QUESTION                     FUNC_ATTR_NONNULL_RET
-set QUESTION                     FUNC_ATTR_NORETURN
-set QUESTION                     FUNC_ATTR_NO_SANITIZE_UNDEFINED
-set QUESTION                     FUNC_ATTR_NO_SANITIZE_ADDRESS
-set QUESTION                     FUNC_ATTR_PRINTF
-set QUESTION                     FUNC_ATTR_PURE
-set QUESTION                     FUNC_ATTR_UNUSED
-set QUESTION                     FUNC_ATTR_WARN_UNUSED_RESULT
+set CLASS_COLON                  FUNC_API_CHECK_TEXTLOCK
+set CLASS_COLON                  FUNC_API_DEPRECATED_SINCE
+set CLASS_COLON                  FUNC_API_FAST
+set CLASS_COLON                  FUNC_API_LUA_ONLY
+set CLASS_COLON                  FUNC_API_NOEXPORT
+set CLASS_COLON                  FUNC_API_REMOTE_ONLY
+set CLASS_COLON                  FUNC_API_SINCE
+set CLASS_COLON                  FUNC_ATTR_ALWAYS_INLINE
+set CLASS_COLON                  FUNC_ATTR_CONST
+set CLASS_COLON                  FUNC_ATTR_MALLOC
+set CLASS_COLON                  FUNC_ATTR_NONNULL_ALL
+set CLASS_COLON                  FUNC_ATTR_NONNULL_ARG
+set CLASS_COLON                  FUNC_ATTR_NONNULL_RET
+set CLASS_COLON                  FUNC_ATTR_NORETURN
+set CLASS_COLON                  FUNC_ATTR_NO_SANITIZE_ADDRESS
+set CLASS_COLON                  FUNC_ATTR_NO_SANITIZE_UNDEFINED
+set CLASS_COLON                  FUNC_ATTR_PRINTF
+set CLASS_COLON                  FUNC_ATTR_PURE
+set CLASS_COLON                  FUNC_ATTR_WARN_UNUSED_RESULT
 set PP_PRAGMA                    PRAGMA_DIAG_PUSH_IGNORE_IMPLICIT_FALLTHROUGH
 set PP_PRAGMA                    PRAGMA_DIAG_PUSH_IGNORE_MISSING_PROTOTYPES
-set QUESTION                     REAL_FATTR_ALWAYS_INLINE
-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: 112
+set CLASS_COLON                  REAL_FATTR_ALWAYS_INLINE
+set CLASS_COLON                  REAL_FATTR_CONST
+set CLASS_COLON                  REAL_FATTR_NONNULL_ALL
+set CLASS_COLON                  REAL_FATTR_PURE
+set CLASS_COLON                  REAL_FATTR_WARN_UNUSED_RESULT
+# option(s) with 'not default' value: 117
 #