[from now] 2013/05/23 17:00:34

diff --git a/.uncrc b/.uncrc
index 87e3bcb..5da5f2d 100644
--- a/.uncrc
+++ b/.uncrc
@@ -181,7 +181,7 @@ nl_before_throw                          = remove
 nl_after_case                            = false
 nl_case_colon_brace                      = remove
 nl_namespace_brace                       = add
-nl_template_class                        = remove
+nl_template_class                        = add
 nl_class_brace                           = add
 nl_class_init_args                       = add
 nl_func_type_name                        = remove
@@ -194,8 +194,8 @@ nl_func_decl_start                       = remove
 nl_func_def_start                        = remove
 nl_func_decl_start_single                = remove
 nl_func_def_start_single                 = remove
-nl_func_decl_args                        = remove
-nl_func_def_args                         = remove
+nl_func_decl_args                        = add
+nl_func_def_args                         = add
 nl_func_decl_end                         = remove
 nl_func_def_end                          = remove
 nl_func_decl_end_single                  = remove
@@ -204,7 +204,7 @@ nl_func_decl_empty                       = remove
 nl_func_def_empty                        = remove
 nl_oc_msg_args                           = false
 nl_fdef_brace                            = add
-nl_return_expr                           = remove
+nl_return_expr                           = ignore
 nl_after_semicolon                       = true
 nl_after_brace_open                      = true
 nl_after_brace_open_cmt                  = true
@@ -215,22 +215,22 @@ nl_after_vbrace_close                    = true
 nl_brace_struct_var                      = remove
 nl_define_macro                          = true
 nl_squeeze_ifdef                         = false
-nl_before_if                             = remove
-nl_after_if                              = remove
-nl_before_for                            = remove
-nl_after_for                             = remove
-nl_before_while                          = remove
-nl_after_while                           = remove
-nl_before_switch                         = remove
-nl_after_switch                          = remove
-nl_before_do                             = remove
-nl_after_do                              = remove
+nl_before_if                             = ignore
+nl_after_if                              = ignore
+nl_before_for                            = ignore
+nl_after_for                             = ignore
+nl_before_while                          = ignore
+nl_after_while                           = ignore
+nl_before_switch                         = ignore
+nl_after_switch                          = ignore
+nl_before_do                             = ignore
+nl_after_do                              = ignore
 nl_ds_struct_enum_cmt                    = false
 nl_ds_struct_enum_close_brace            = false
 nl_class_colon                           = add
-nl_create_if_one_liner                   = false
-nl_create_for_one_liner                  = false
-nl_create_while_one_liner                = false
+nl_create_if_one_liner                   = true
+nl_create_for_one_liner                  = true
+nl_create_while_one_liner                = true

 # blankline
@@ -277,15 +277,15 @@ pos_class_colon         = lead

 # mod

-mod_full_brace_do                           = add
-mod_full_brace_for                          = add
+mod_full_brace_do                           = ignore
+mod_full_brace_for                          = ignore
 mod_full_brace_function                     = ignore
-mod_full_brace_if                           = add
+mod_full_brace_if                           = ignore
 mod_full_brace_if_chain                     = false
 mod_full_brace_nl                           = 0
-mod_full_brace_while                        = add
+mod_full_brace_while                        = ignore
 mod_full_brace_using                        = ignore
-mod_paren_on_return                         = remove
+mod_paren_on_return                         = ignore
 mod_pawn_semicolon                          = false
 mod_full_paren_if_bool                      = false
 mod_remove_extra_semicolon                  = true
@@ -302,7 +302,7 @@ mod_remove_empty_return                     = false

 # comment

-cmt_width                           = 120
+cmt_width                           = 0
 cmt_reflow_mode                     = 1
 cmt_indent_multi                    = false
 cmt_c_group                         = false
diff --git a/.vimrc b/.vimrc
index 332fb1f..a94a389 100644
--- a/.vimrc
+++ b/.vimrc
@@ -224,7 +224,7 @@ nnoremap      -          20<C-w>+
 nnoremap      <Space>q   :q!<CR>
 nnoremap      <Space>,   :e      $MYVIMRC<CR>
 nnoremap      <Space>5   :source $MYVIMRC<CR>
-nnoremap      <silent> <Space>l   :w<CR>:!uncrustify --no-backup -c ~/.uncrc %<CR>:e<CR>
+nnoremap      <silent>   <Space>l   :w<CR>:!uncrustify --no-backup -c ~/.uncrc %<CR>:e<CR>
 inoremap      <C-b>      <Left>
 inoremap      <C-f>      <Right>
 inoremap      <C-e>      <End>