Merge branch 'master' of git.246060.ru:f1x1t/uncrustify
This commit is contained in:
commit
eb34f3ffb3
16
default.cfg
16
default.cfg
@ -141,7 +141,7 @@ sp_enum_before_assign = ignore # ignore/add/remove/force
|
||||
sp_enum_after_assign = ignore # ignore/add/remove/force
|
||||
|
||||
# Add or remove space around assignment ':' in enum.
|
||||
sp_enum_colon = ignore # ignore/add/remove/force
|
||||
sp_enum_colon = force # ignore/add/remove/force
|
||||
|
||||
# Add or remove space around preprocessor '##' concatenation operator.
|
||||
#
|
||||
@ -806,30 +806,30 @@ sp_after_oc_property = ignore # ignore/add/remove/force
|
||||
sp_after_oc_synchronized = ignore # ignore/add/remove/force
|
||||
|
||||
# Add or remove space around the ':' in 'b ? t : f'.
|
||||
sp_cond_colon = ignore # ignore/add/remove/force
|
||||
sp_cond_colon = force # ignore/add/remove/force
|
||||
|
||||
# Add or remove space before the ':' in 'b ? t : f'.
|
||||
#
|
||||
# Overrides sp_cond_colon.
|
||||
sp_cond_colon_before = ignore # ignore/add/remove/force
|
||||
sp_cond_colon_before = force # ignore/add/remove/force
|
||||
|
||||
# Add or remove space after the ':' in 'b ? t : f'.
|
||||
#
|
||||
# Overrides sp_cond_colon.
|
||||
sp_cond_colon_after = ignore # ignore/add/remove/force
|
||||
sp_cond_colon_after = force # ignore/add/remove/force
|
||||
|
||||
# Add or remove space around the '?' in 'b ? t : f'.
|
||||
sp_cond_question = ignore # ignore/add/remove/force
|
||||
sp_cond_question = force # ignore/add/remove/force
|
||||
|
||||
# Add or remove space before the '?' in 'b ? t : f'.
|
||||
#
|
||||
# Overrides sp_cond_question.
|
||||
sp_cond_question_before = ignore # ignore/add/remove/force
|
||||
sp_cond_question_before = force # ignore/add/remove/force
|
||||
|
||||
# Add or remove space after the '?' in 'b ? t : f'.
|
||||
#
|
||||
# Overrides sp_cond_question.
|
||||
sp_cond_question_after = ignore # ignore/add/remove/force
|
||||
sp_cond_question_after = force # ignore/add/remove/force
|
||||
|
||||
# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
|
||||
# and ':'.
|
||||
@ -2329,7 +2329,7 @@ align_var_def_thresh = 1 # number
|
||||
align_var_def_gap = 0 # unsigned number
|
||||
|
||||
# Whether to align the colon in struct bit fields.
|
||||
align_var_def_colon = false # true/false
|
||||
align_var_def_colon = true # true/false
|
||||
|
||||
# The gap for aligning the colon in struct bit fields.
|
||||
align_var_def_colon_gap = 0 # unsigned number
|
||||
|
Loading…
Reference in New Issue
Block a user