@@ -908,12 +908,6 @@ sp_inside_newop_paren_open = ignore # ignore/add/remove/force
908908# Overrides sp_inside_newop_paren.
909909sp_inside_newop_paren_close = ignore # ignore/add/remove/force
910910
911- # Add or remove space before a trailing or embedded comment.
912- sp_before_tr_cmt = ignore # ignore/add/remove/force
913-
914- # Number of spaces before a trailing or embedded comment.
915- sp_num_before_tr_cmt = 0 # unsigned number
916-
917911# (Java) Add or remove space between an annotation and the open parenthesis.
918912sp_annotation_paren = ignore # ignore/add/remove/force
919913
@@ -1128,7 +1122,6 @@ indent_member = 0 # unsigned number
11281122indent_member_single = false # true/false
11291123
11301124# Spaces to indent single line ('//') comments on lines before code.
1131- indent_single_line_comments_before = 0 # unsigned number
11321125
11331126# When opening a paren for a control statement (if, for, while, etc), increase
11341127# the indent level by this value. Negative values decrease the indent level.
@@ -1286,7 +1279,7 @@ indent_oc_block_msg_from_keyword = false # true/false
12861279# colon. Requires indent_oc_block_msg=true.
12871280indent_oc_block_msg_from_colon = false # true/false
12881281
1289- # (OC) Whether to indent blocks from where the block caret is.
1282+ # (OC) Whether to indent blocks from where the brace caret is.
12901283# Requires indent_oc_block_msg=true.
12911284indent_oc_block_msg_from_caret = false # true/false
12921285
@@ -2061,7 +2054,6 @@ nl_after_func_body_one_liner = 0 # unsigned number
20612054# of a function body.
20622055#
20632056# 0: No change (default).
2064- nl_var_def_blk_end_func_top = 0 # unsigned number
20652057nl_var_def_blk_end = 0 # unsigned number
20662058
20672059# The number of newlines before a block of typedefs. If nl_after_access_spec
0 commit comments