From: Martin Taibr Date: Sat, 23 Sep 2017 23:20:29 +0000 (+0200) Subject: remove indents from preprocessor macros X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=43e59796e138c96dda6663007654bfe9496e391f;p=xonotic%2Fxonotic-data.pk3dir.git remove indents from preprocessor macros --- diff --git a/qcsrc/tools/uncrustify-unmodified.py b/qcsrc/tools/uncrustify-unmodified.py index c9c558428..a5869acca 100755 --- a/qcsrc/tools/uncrustify-unmodified.py +++ b/qcsrc/tools/uncrustify-unmodified.py @@ -25,7 +25,7 @@ def main(): # get all remote branches - those would potentially get merge conflicts if we formatted everything branches = run('git branch --list --remotes') # strip the leading spaces and ignore branches that are presumably used for debugging uncrustify - branches = [b.strip() for b in branches if "uncrustify" not in b] + branches = [b.strip() for b in branches if "uncrustify" not in b and "uncrustified" not in b] branches.remove('origin/HEAD -> origin/master') branches.remove('origin/master') diff --git a/qcsrc/uncrustify.cfg b/qcsrc/uncrustify.cfg index 0bcab10d6..64fe7dd5c 100644 --- a/qcsrc/uncrustify.cfg +++ b/qcsrc/uncrustify.cfg @@ -1752,7 +1752,7 @@ cmt_insert_before_preproc = false # false/true # Control indent of preprocessors inside #if blocks at brace level 0 # WARNING: Indifferent... please decide manually. -pp_indent = ignore # ignore/add/remove/force +pp_indent = remove # ignore/add/remove/force # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false) pp_indent_at_level = false # false/true