Compare commits

..

No commits in common. "1c219849d248302cb42d008e0fadfcba5f653e6c" and "e893f9967d394d565a31d636964f6db62221d35b" have entirely different histories.

View File

@ -2612,7 +2612,7 @@ pp_indent = ignore # ignore/add/remove/force
# Whether to indent #if/#else/#endif at the brace level. If false, these are # Whether to indent #if/#else/#endif at the brace level. If false, these are
# indented from column 1. # indented from column 1.
pp_indent_at_level = true # true/false pp_indent_at_level = false # true/false
# Specifies the number of columns to indent preprocessors per level # Specifies the number of columns to indent preprocessors per level
# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies # at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
@ -2620,10 +2620,10 @@ pp_indent_at_level = true # true/false
# at brace level > 0 (function-level). # at brace level > 0 (function-level).
# #
# Default: 1 # Default: 1
pp_indent_count = 4 # unsigned number pp_indent_count = 1 # unsigned number
# Add or remove space after # based on pp_level of #if blocks. # Add or remove space after # based on pp_level of #if blocks.
pp_space = remove # ignore/add/remove/force pp_space = ignore # ignore/add/remove/force
# Sets the number of spaces per level added with pp_space. # Sets the number of spaces per level added with pp_space.
pp_space_count = 0 # unsigned number pp_space_count = 0 # unsigned number
@ -2805,5 +2805,3 @@ warn_level_tabs_found_in_verbatim_string_literals = 2 # unsigned number
# #
# option(s) with 'not default' value: 99 # option(s) with 'not default' value: 99
# #
sp_trailing_ret_t = force