From: Martin Taibr Date: Fri, 22 Sep 2017 23:48:57 +0000 (+0200) Subject: adjust some more options to result in fewer changes X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ab1dcaa69f51761a4da4656e9520a1bd12084503;p=xonotic%2Fxonotic-data.pk3dir.git adjust some more options to result in fewer changes --- diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg index 6e05326a9..18fadc7b0 100644 --- a/qcsrc/uncrustify.cfg +++ b/qcsrc/uncrustify.cfg @@ -217,7 +217,9 @@ indent_paren_nl = false # false/true #force # 0: Indent to body level # 1: Align under the open paren # 2: Indent to the brace level -indent_paren_close = 1 # number #force +# note: i think option 2 is still buggy but it results in the fewest changes +# so presumably it aligns well with what we already use +indent_paren_close = 2 # number #force # Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -809,7 +811,7 @@ sp_after_new = ignore # ignore/add/remove/force sp_before_tr_emb_cmt = force # ignore/add/remove/force #force # Number of spaces before a trailing or embedded comment -sp_num_before_tr_emb_cmt = 2 # number #force +sp_num_before_tr_emb_cmt = 1 # number #force # Control space between a Java annotation and the open paren. # WARNING: Code doesn't seem to use this feature - delete from the config? @@ -1780,10 +1782,10 @@ pp_region_indent_code = true # false/true pp_indent_if = 4 # number # Control whether to indent the code between #if, #else and #endif when not at file-level -pp_if_indent_code = true # false/true +pp_if_indent_code = false # false/true # Whether to indent '#define' at the brace level (true) or from column 1 (false) -pp_define_at_level = true # false/true +pp_define_at_level = false # false/true # You can force a token to be a type with the 'type' option. # Example: