0.69

default.cfg

@@ -1,4 +1,4 @@
-# Uncrustify-0.68_f
+# Uncrustify-0.69.0_f
 
 #
 # General options
@@ -86,6 +86,8 @@ sp_cpp_lambda_assign            = remove   # ignore/add/remove/force
 sp_cpp_lambda_paren             = remove   # ignore/add/remove/force
 
 # Add or remove space around assignment operator '=' in a prototype.
+#
+# If set to ignore, use sp_assign.
 sp_assign_default               = ignore   # ignore/add/remove/force
 
 # Add or remove space before assignment operator '=', '+=', etc.
@@ -225,6 +227,9 @@ sp_before_angle                 = ignore   # ignore/add/remove/force
 # Add or remove space inside '<' and '>'.
 sp_inside_angle                 = ignore   # ignore/add/remove/force
 
+# Add or remove space inside '<>'.
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force
+
 # Add or remove space between '>' and ':'.
 sp_angle_colon                  = ignore   # ignore/add/remove/force
 
@@ -356,9 +361,18 @@ sp_before_ellipsis              = ignore   # ignore/add/remove/force
 # Add or remove space between a type and '...'.
 sp_type_ellipsis                = ignore   # ignore/add/remove/force
 
+# (D) Add or remove space between a type and '?'.
+sp_type_question                = ignore   # ignore/add/remove/force
+
 # Add or remove space between ')' and '...'.
 sp_paren_ellipsis               = ignore   # ignore/add/remove/force
 
+# Add or remove space between ')' and a qualifier such as 'const'.
+sp_paren_qualifier              = force    # ignore/add/remove/force
+
+# Add or remove space between ')' and 'noexcept'.
+sp_paren_noexcept               = force    # ignore/add/remove/force
+
 # Add or remove space after class ':'.
 sp_after_class_colon            = force    # ignore/add/remove/force
 
@@ -366,10 +380,10 @@ sp_after_class_colon            = force    # ignore/add/remove/force
 sp_before_class_colon           = force    # ignore/add/remove/force
 
 # Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
+sp_after_constr_colon           = force    # ignore/add/remove/force
 
 # Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
+sp_before_constr_colon          = force    # ignore/add/remove/force
 
 # Add or remove space before case ':'.
 #
@@ -545,6 +559,10 @@ sp_catch_paren                  = ignore   # ignore/add/remove/force
 # in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
 sp_oc_catch_paren               = ignore   # ignore/add/remove/force
 
+# (OC) Add or remove space between class name and '('
+# in '@interface className(categoryName)<ProtocolName>:BaseClass'
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force
+
 # (D) Add or remove space between 'version' and '('
 # in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
 sp_version_paren                = ignore   # ignore/add/remove/force
@@ -843,6 +861,9 @@ sp_skip_vbrace_tokens           = false    # true/false
 # Add or remove space after 'noexcept'.
 sp_after_noexcept               = ignore   # ignore/add/remove/force
 
+# Add or remove space after '_'.
+sp_vala_after_translation       = ignore   # ignore/add/remove/force
+
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
 
@@ -855,9 +876,9 @@ force_tab_after_define          = false    # true/false
 # Default: 8
 indent_columns                  = 8        # unsigned number
 
-# The continuation indent. If non-zero, this overrides the indent of '(' and
+# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# '=' continuation indents. Negative values are OK; negative value is absolute
+# and '=' continuation indents. Negative values are OK; negative value is
-# and not increased for each '(' level.
+# absolute and not increased for each '(' or '[' level.
 #
 # For FreeBSD, this is set to 4.
 indent_continue                 = 0        # number
@@ -910,7 +931,7 @@ indent_braces_no_class          = false    # true/false
 indent_braces_no_struct         = false    # true/false
 
 # Whether to indent based on the size of the brace parent,
-# i.e. 'if' → 3 spaces, 'for' → 4 spaces, etc.
+# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
 indent_brace_parent             = false    # true/false
 
 # Whether to indent based on the open parenthesis instead of the open brace
@@ -932,6 +953,7 @@ indent_namespace                = false    # true/false
 indent_namespace_single_indent  = false    # true/false
 
 # The number of spaces to indent a namespace block.
+# If set to zero, use the value indent_columns
 indent_namespace_level          = 0        # unsigned number
 
 # If the body of the namespace is longer than this number, it won't be
@@ -970,7 +992,7 @@ indent_else_if                  = true    # true/false
 # Amount to indent variable declarations after a open brace.
 #
 #  <0: Relative
-# ≥0: Absolute
+# >=0: Absolute
 indent_var_def_blk              = 0        # number
 
 # Whether to indent continued variable declarations instead of aligning.
@@ -1048,10 +1070,13 @@ indent_case_brace               = 0        # number
 # Whether to indent comments found in first column.
 indent_col1_comment             = false    # true/false
 
+# Whether to indent multi string literal in first column.
+indent_col1_multi_string_literal = false    # true/false
+
 # How to indent goto labels.
 #
 #  >0: Absolute column where 1 is the leftmost column
-# ≤0: Subtract from brace indent
+# <=0: Subtract from brace indent
 #
 # Default: 1
 indent_label                    = 1        # number
@@ -1122,7 +1147,7 @@ indent_preserve_sql             = false    # true/false
 # Default: true
 indent_align_assign             = true     # true/false
 
-# Whether to align continued statements at the '('. If false or the '(' is not
+# Whether to align continued statements at the '('. If false or the '(' is
 # followed by a newline, the next line indent is one tab.
 #
 # Default: true
@@ -1250,7 +1275,7 @@ nl_for_leave_one_liners         = true     # true/false
 nl_oc_msg_leave_one_liner       = false    # true/false
 
 # (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = true     # ignore/add/remove/force
+nl_oc_mdef_brace                = force    # ignore/add/remove/force
 
 # (OC) Add or remove newline between Objective-C block signature and '{'.
 nl_oc_block_brace               = ignore   # ignore/add/remove/force
@@ -1262,18 +1287,18 @@ nl_oc_interface_brace           = ignore   # ignore/add/remove/force
 nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
 
 # Add or remove newlines at the start of the file.
-nl_start_of_file                = true     # ignore/add/remove/force
+nl_start_of_file                = ignore   # ignore/add/remove/force
 
 # The minimum number of newlines at the start of the file (only used if
 # nl_start_of_file is 'add' or 'force').
 nl_start_of_file_min            = 0        # unsigned number
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = force    # ignore/add/remove/force
 
 # The minimum number of newlines at the end of the file (only used if
 # nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
+nl_end_of_file_min              = 1        # unsigned number
 
 # Add or remove newline between '=' and '{'.
 nl_assign_brace                 = ignore   # ignore/add/remove/force
@@ -1288,47 +1313,6 @@ nl_tsquare_brace                = ignore   # ignore/add/remove/force
 # the ']'.
 nl_after_square_assign          = ignore   # ignore/add/remove/force
 
-# 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             = 1        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0 = No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0 = No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0 = No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of 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.
-#
-# 0 = No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0 = No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0 = No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
 # Add or remove newline between a function call's ')' and '{', as in
 # 'list_for_each(item, &list) { }'.
 nl_fcall_brace                  = add      # ignore/add/remove/force
@@ -1474,14 +1458,14 @@ nl_template_class               = ignore   # ignore/add/remove/force
 # Add or remove newline between 'class' and '{'.
 nl_class_brace                  = add      # ignore/add/remove/force
 
-# Add or remove newline before or after (depending on pos_class_comma) each
+# Add or remove newline before or after (depending on pos_class_comma,
-# ',' in the base class list.
+# may not be IGNORE) each',' in the base class list.
 nl_class_init_args              = ignore   # ignore/add/remove/force
 
 # Add or remove newline after each ',' in the constructor member
 # initialization. Related to nl_constr_colon, pos_constr_colon and
 # pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force
+nl_constr_init_args             = force    # ignore/add/remove/force
 
 # Add or remove newline before first element, after comma, and after last
 # element, in 'enum'.
@@ -1592,6 +1576,10 @@ nl_func_def_empty               = ignore   # ignore/add/remove/force
 # Add or remove newline between '()' in a function call.
 nl_func_call_empty              = ignore   # ignore/add/remove/force
 
+# Whether to add a newline after '(' in a function call,
+# has preference over nl_func_call_start_multi_line.
+nl_func_call_start              = ignore   # ignore/add/remove/force
+
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
 nl_func_call_start_multi_line   = false    # true/false
@@ -1611,6 +1599,10 @@ nl_oc_msg_args                  = false    # true/false
 # Add or remove newline between function signature and '{'.
 nl_fdef_brace                   = add      # ignore/add/remove/force
 
+# Add or remove newline between function signature and '{',
+# if signature ends with ')'. Overrides nl_fdef_brace.
+nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
+
 # Add or remove newline between C++11 lambda signature and '{'.
 nl_cpp_ldef_brace               = remove   # ignore/add/remove/force
 
@@ -1717,6 +1709,14 @@ nl_before_do                    = ignore   # ignore/add/remove/force
 # Add or remove blank line after 'do/while' statement.
 nl_after_do                     = ignore   # ignore/add/remove/force
 
+# Whether to put a blank line before 'return' statements, unless after an open
+# brace.
+nl_before_return                = force    # true/false
+
+# Whether to put a blank line after 'return' statements, unless followed by a
+# close brace.
+nl_after_return                 = true     # true/false
+
 # Whether to double-space commented-entries in 'struct'/'union'/'enum'.
 nl_ds_struct_enum_cmt           = false    # true/false
 
@@ -1738,15 +1738,15 @@ nl_constr_colon                 = ignore   # ignore/add/remove/force
 nl_namespace_two_to_one_liner   = false    # true/false
 
 # Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' → 'if(b) i++;'.
+# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
 nl_create_if_one_liner          = true     # true/false
 
 # Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' → 'for (...) stmt;'.
+# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
 nl_create_for_one_liner         = true     # true/false
 
 # Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' → 'while (expr) stmt;'.
+# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
 nl_create_while_one_liner       = true     # true/false
 
 # Whether to collapse a function definition whose body (not counting braces)
@@ -1824,6 +1824,47 @@ 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             = 1        # unsigned number
+
+# The number of newlines before a block of typedefs. If nl_after_access_spec
+# is non-zero, that option takes precedence.
+#
+# 0 = No change (default).
+nl_typedef_blk_start            = 0        # unsigned number
+
+# The number of newlines after a block of typedefs.
+#
+# 0 = No change (default).
+nl_typedef_blk_end              = 0        # unsigned number
+
+# The maximum number of consecutive newlines within a block of typedefs.
+#
+# 0 = No change (default).
+nl_typedef_blk_in               = 0        # unsigned number
+
+# The number of 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.
+#
+# 0 = No change (default).
+nl_var_def_blk_start            = 0        # unsigned number
+
+# The number of newlines after a block of variable definitions not at the top
+# of a function body.
+#
+# 0 = No change (default).
+nl_var_def_blk_end              = 0        # unsigned number
+
+# The maximum number of consecutive newlines within a block of variable
+# definitions.
+#
+# 0 = No change (default).
+nl_var_def_blk_in               = 0        # unsigned number
+
 # The minimum number of newlines before a multi-line comment.
 # Doesn't apply if after a brace open or another multi-line comment.
 nl_before_block_comment         = 0        # unsigned number
@@ -1915,14 +1956,6 @@ eat_blanks_before_close_brace   = false    # true/false
 # 2: Remove all newlines and reformat completely by config
 nl_remove_extra_newlines        = 0        # unsigned number
 
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
 # (Java) Add or remove newline after an annotation statement. Only affects
 # annotations that are after a newline.
 nl_after_annotation             = ignore   # ignore/add/remove/force
@@ -1963,7 +1996,7 @@ pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/
 
 # The position of the comma in the constructor initialization list.
 # Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_comma                = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 # The position of trailing/leading class colon, between class and base class
 # list. Affects nl_class_colon.
@@ -1971,7 +2004,7 @@ pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/
 
 # The position of colons between constructor and member initialization.
 # Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_colon                = force    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
 
 #
 # Line splitting options
@@ -1984,10 +2017,12 @@ code_width                      = 0        # unsigned number
 ls_for_split_full               = false    # true/false
 
 # Whether to fully split long function prototypes/calls at commas.
+# The option ls_code_width has priority over the option ls_func_split_full.
 ls_func_split_full              = false    # true/false
 
 # Whether to split lines as close to code_width as possible and ignore some
 # groupings.
+# The option ls_code_width has priority over the option ls_func_split_full.
 ls_code_width                   = false    # true/false
 
 #
@@ -2018,13 +2053,28 @@ align_func_params               = false    # true/false
 align_func_params_span          = 0        # unsigned number
 
 # The threshold for aligning function parameter definitions.
+# Use a negative number for absolute thresholds.
 #
 # 0 = No limit (default).
-align_func_params_thresh        = 0        # unsigned number
+align_func_params_thresh        = 0        # number
 
 # The gap for aligning function parameter definitions.
 align_func_params_gap           = 0        # unsigned number
 
+# The span for aligning constructor value.
+#
+# 0 = Don't align (default).
+align_constr_value_span         = 0        # unsigned number
+
+# The threshold for aligning constructor value.
+# Use a negative number for absolute thresholds.
+#
+# 0 = No limit (default).
+align_constr_value_thresh       = 0        # number
+
+# The gap for aligning constructor value.
+align_constr_value_gap          = 0        # unsigned number
+
 # Whether to align parameters in single-line functions that have the same
 # name. The function names must already be aligned with each other.
 align_same_func_call_params     = false    # true/false
@@ -2036,33 +2086,37 @@ align_same_func_call_params_span = 0        # unsigned number
 
 # The threshold for aligning function-call parameters for single line
 # functions.
+# Use a negative number for absolute thresholds.
 #
 # 0 = No limit (default).
-align_same_func_call_params_thresh = 0        # unsigned number
+align_same_func_call_params_thresh = 0        # number
 
 # The span for aligning variable definitions.
 #
 # 0 = Don't align (default).
 align_var_def_span              = 0        # unsigned number
 
-# How to align the '*' in variable definitions.
+# How to consider (or treat) the '*' in the alignment of variable definitions.
 #
 # 0: Part of the type     'void *   foo;' (default)
 # 1: Part of the variable 'void     *foo;'
 # 2: Dangling             'void    *foo;'
+# Dangling: the '*' will not be taken into account when aligning.
 align_var_def_star_style        = 0        # unsigned number
 
-# How to align the '&' in variable definitions.
+# How to consider (or treat) the '&' in the alignment of variable definitions.
 #
 # 0: Part of the type     'long &   foo;' (default)
 # 1: Part of the variable 'long     &foo;'
 # 2: Dangling             'long    &foo;'
+# Dangling: the '&' will not be taken into account when aligning.
 align_var_def_amp_style         = 0        # unsigned number
 
 # The threshold for aligning variable definitions.
+# Use a negative number for absolute thresholds.
 #
 # 0 = No limit (default).
-align_var_def_thresh            = 0        # unsigned number
+align_var_def_thresh            = 0        # number
 
 # The gap for aligning variable definitions.
 align_var_def_gap               = 0        # unsigned number
@@ -2084,10 +2138,16 @@ align_var_def_inline            = false    # true/false
 # 0 = Don't align (default).
 align_assign_span               = 0        # unsigned number
 
+# The span for aligning on '=' in function prototype modifier.
+#
+# 0 = Don't align (default).
+align_assign_func_proto_span    = 0        # unsigned number
+
 # The threshold for aligning on '=' in assignments.
+# Use a negative number for absolute thresholds.
 #
 # 0 = No limit (default).
-align_assign_thresh             = 0        # unsigned number
+align_assign_thresh             = 0        # number
 
 # How to apply align_assign_span to function declaration "assignments", i.e.
 # 'virtual void foo() = 0' or '~foo() = {default|delete}'.
@@ -2103,9 +2163,10 @@ align_assign_decl_func          = 0        # unsigned number
 align_enum_equ_span             = 0        # unsigned number
 
 # The threshold for aligning on '=' in enums.
+# Use a negative number for absolute thresholds.
 #
 # 0 = no limit (default).
-align_enum_equ_thresh           = 0        # unsigned number
+align_enum_equ_thresh           = 0        # number
 
 # The span for aligning class member definitions.
 #
@@ -2113,9 +2174,10 @@ align_enum_equ_thresh           = 0        # unsigned number
 align_var_class_span            = 0        # unsigned number
 
 # The threshold for aligning class member definitions.
+# Use a negative number for absolute thresholds.
 #
 # 0 = No limit (default).
-align_var_class_thresh          = 0        # unsigned number
+align_var_class_thresh          = 0        # number
 
 # The gap for aligning class member definitions.
 align_var_class_gap             = 0        # unsigned number
@@ -2126,9 +2188,10 @@ align_var_class_gap             = 0        # unsigned number
 align_var_struct_span           = 0        # unsigned number
 
 # The threshold for aligning struct/union member definitions.
+# Use a negative number for absolute thresholds.
 #
 # 0 = No limit (default).
-align_var_struct_thresh         = 0        # unsigned number
+align_var_struct_thresh         = 0        # number
 
 # The gap for aligning struct/union member definitions.
 align_var_struct_gap            = 0        # unsigned number
@@ -2138,14 +2201,14 @@ align_var_struct_gap            = 0        # unsigned number
 # 0 = Don't align (default).
 align_struct_init_span          = 0        # unsigned number
 
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
 # The span for aligning single-line typedefs.
 #
 # 0 = Don't align (default).
 align_typedef_span              = 0        # unsigned number
 
+# The minimum space between the type and the synonym of a typedef.
+align_typedef_gap               = 0        # unsigned number
+
 # How to align typedef'd functions with other typedefs.
 #
 # 0: Don't mix them at all (default)
@@ -2153,18 +2216,20 @@ align_typedef_span              = 0        # unsigned number
 # 2: Align the function type name with the other type names
 align_typedef_func              = 0        # unsigned number
 
-# How to align the '*' in typedefs.
+# How to consider (or treat) the '*' in the alignment of typedefs.
 #
-# 0: Align on typedef type, ignore '*' (default)
+# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: The '*' is part of type name: 'typedef int  *pint;'
+# 1: Part of type name:        'typedef int   *pint;'
-# 2: The '*' is part of the type, but dangling: 'typedef int *pint;'
+# 2: Dangling:                 'typedef int  *pint;'
+# Dangling: the '*' will not be taken into account when aligning.
 align_typedef_star_style        = 0        # unsigned number
 
-# How to align the '&' in typedefs.
+# How to consider (or treat) the '&' in the alignment of typedefs.
 #
-# 0: Align on typedef type, ignore '&' (default)
+# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: The '&' is part of type name: 'typedef int  &pint;'
+# 1: Part of type name:        'typedef int   &intref;'
-# 2: The '&' is part of the type, but dangling: 'typedef int &pint;'
+# 2: Dangling:                 'typedef int  &intref;'
+# Dangling: the '&' will not be taken into account when aligning.
 align_typedef_amp_style         = 0        # unsigned number
 
 # The span for aligning comments that end lines.
@@ -2172,6 +2237,11 @@ align_typedef_amp_style         = 0        # unsigned number
 # 0 = Don't align (default).
 align_right_cmt_span            = 0        # unsigned number
 
+# Minimum number of columns between preceding text and a trailing comment in
+# order for the comment to qualify for being aligned. Must be non-zero to have
+# an effect.
+align_right_cmt_gap             = 0        # unsigned number
+
 # If aligning comments, whether to mix with comments after '}' and #endif with
 # less than three spaces before the comment.
 align_right_cmt_mix             = false    # true/false
@@ -2179,11 +2249,6 @@ align_right_cmt_mix             = false    # true/false
 # Whether to only align trailing comments that are at the same brace level.
 align_right_cmt_same_level      = false    # true/false
 
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
 # Minimum column at which to align trailing comments. Comments which are
 # aligned beyond this column, but which can be aligned in a lesser column,
 # may be "pulled in".
@@ -2196,6 +2261,12 @@ align_right_cmt_at_col          = 0        # unsigned number
 # 0 = Don't align (default).
 align_func_proto_span           = 0        # unsigned number
 
+# The threshold for aligning function prototypes.
+# Use a negative number for absolute thresholds.
+#
+# 0 = No limit (default).
+align_func_proto_thresh         = 0        # number
+
 # Minimum gap between the return type and the function name.
 align_func_proto_gap            = 0        # unsigned number
 
@@ -2230,15 +2301,15 @@ align_nl_cont                   = false    # true/false
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false
 
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
 # The span for aligning on '#define' bodies.
 #
 # =0: Don't align (default)
 # >0: Number of lines (including comments) between blocks
 align_pp_define_span            = 0        # unsigned number
 
+# The minimum space between label and value of a preprocessor define.
+align_pp_define_gap             = 0        # unsigned number
+
 # Whether to align lines that start with '<<' with previous '<<'.
 #
 # Default: true
@@ -2448,7 +2519,7 @@ mod_paren_on_return             = add    # ignore/add/remove/force
 mod_pawn_semicolon              = false    # true/false
 
 # Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' → 'if (a && (b > c))'.
+# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
 mod_full_paren_if_bool          = true     # true/false
 
 # Whether to remove superfluous semicolons.
@@ -2490,7 +2561,7 @@ mod_sort_using                  = false    # true/false
 mod_sort_include                = false    # true/false
 
 # Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' → 'case X: { ... break; }'.
+# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
 mod_move_case_break             = false    # true/false
 
 # Add or remove braces around a fully braced case statement. Will only remove
@@ -2695,7 +2766,7 @@ warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 #       `set BOOL __AND__ __OR__`
 #
 #     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' → 'BOOL'
+#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
 #
 #
 # - Token(s) can be treated as type(s) with the 'type' option.
@@ -2719,7 +2790,7 @@ warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 #       `file_ext CPP .ch .cxx .cpp.in`
 #
 #     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' → 'CPP'
+#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
 #
 #
 # - Custom macro-based indentation can be set up using 'macro-open',
@@ -2732,5 +2803,5 @@ warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-# option(s) with 'not default' value: 29
+# option(s) with 'not default' value: 90
 #