[from now] 2013/05/23 12:48:08

diff --git a/.gitconfig b/.gitconfig
index a252af4..f30e4c3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -19,7 +19,6 @@
     oc = ls-files -o # out of control
     ca = !git now && git reset --hard HEAD~ # cancel

-
 # from: http://iyukki.blog56.fc2.com/blog-entry-119.html
 # ll = !git ls-files -cdmokt|perl -pe 's/\\/.*/\\//'|grep -v '/'
 # ls = !git ls-files -t|perl -pe 's/\\/.*/\\//'|uniq -c
diff --git a/.uncrc b/.uncrc
new file mode 100644
index 0000000..e118c46
--- /dev/null
+++ b/.uncrc
@@ -0,0 +1,481 @@
+# preprocessor
+
+pp_indent=remove
+pp_indent_at_level=false
+pp_indent_count=4
+pp_space=remove
+pp_space_count=0
+pp_indent_region      = 0
+pp_region_indent_code = false
+pp_indent_if          = 0
+pp_if_indent_code     = false
+pp_define_at_level    = false
+
+# general
+
+newlines           = lf
+input_tab_size     = 4
+output_tab_size    = 4
+string_escape_char = 92
+tok_split_gte      = false
+utf8_bom           = remove
+utf8_byte          = false
+utf8_force         = true
+
+# indent
+
+indent_columns                          = 4
+indent_continue                         = 0
+indent_with_tabs                        = 0
+indent_align_string                     = false
+indent_brace                            = 0
+indent_braces                           = false
+indent_brace_parent                     = false
+indent_namespace                        = false
+indent_extern                           = false
+indent_class                            = true
+indent_class_colon                      = true
+indent_ctor_init_leading                = 2
+indent_ctor_init                        = 0
+indent_else_if                          = true
+indent_var_def_blk                      = 0
+indent_var_def_cont                     = false
+indent_func_def_force_col1              = false
+indent_func_call_param                  = false
+indent_func_def_param                   = false
+indent_func_proto_param                 = false
+indent_func_class_param                 = false
+indent_func_ctor_var_param              = false
+indent_template_param                   = false
+indent_func_param_double                = false
+indent_func_const                       = 0
+indent_func_throw                       = 0
+indent_member                           = 0
+indent_sing_line_comments               = 0
+indent_relative_single_line_comments    = false
+indent_switch_case                      = 4
+indent_case_shift                       = 0
+indent_case_brace                       = 0
+indent_col1_comment                     = false
+indent_label                            = 1
+indent_access_spec                      = -4
+indent_access_spec_body                 = false
+indent_paren_nl                         = false
+indent_paren_close                      = 0
+indent_comma_paren                      = true
+indent_bool_paren                       = false
+indent_first_bool_expr                  = false
+indent_square_nl                        = false
+indent_preserve_sql                     = false
+indent_align_assign                     = true
+indent_oc_block                         = false
+indent_oc_block_msg                     = 0
+indent_oc_msg_colon                     = 0
+
+# span_thresh_gap
+
+align_keep_tabs                          = false
+align_with_tabs                          = false
+align_on_tabstop                         = false
+align_number_left                        = false
+align_func_params                        = true
+align_same_func_call_params              = false
+align_var_def_star_style                 = 2
+align_var_def_amp_style                  = 2
+align_var_def_colon                      = true
+align_var_def_attribute                  = true
+align_var_def_inline                     = true
+align_var_def_span                       = 1
+align_var_def_thresh                     = 32
+align_var_def_gap                        = 0
+align_assign_span                        = 1
+align_assign_thresh                      = 32
+align_enum_equ_span                      = 1
+align_enum_equ_thresh                    = 32
+align_var_struct_span                    = 1
+align_var_struct_thresh                  = 32
+align_var_struct_gap                     = 0
+align_struct_init_span                   = 1
+align_typedef_gap                        = 0
+align_typedef_span                       = 1
+align_typedef_func                       = 1
+align_typedef_star_style                 = 2
+align_typedef_amp_style                  = 2
+align_right_cmt_span                     = 4
+align_right_cmt_mix                      = false
+align_right_cmt_gap                      = 1
+align_right_cmt_at_col                   = 0
+align_func_proto_span                    = 1
+align_func_proto_gap                     = 0
+align_on_operator                        = true
+align_mix_var_proto                      = false
+align_single_line_func                   = true
+align_single_line_brace                  = true
+align_single_line_brace_gap              = 0
+align_nl_cont                            = true
+align_pp_define_span                     = 1
+align_pp_define_gap                      = 0
+align_pp_define_together                 = true
+align_left_shift                         = true
+align_oc_msg_spec_span                   = 0
+align_oc_msg_colon_span                  = 0
+align_oc_msg_colon_first                 = false
+align_oc_decl_colon                      = false
+
+#
+# Newline adding and removing options
+#
+
+nl_collapse_empty_body                   = false
+nl_assign_leave_one_liners               = false
+nl_class_leave_one_liners                = false
+nl_enum_leave_one_liners                 = false
+nl_getset_leave_one_liners               = false
+nl_func_leave_one_liners                 = false
+nl_if_leave_one_liners                   = false
+nl_oc_msg_leave_one_liner                = false
+nl_start_of_file                         = ignore
+nl_start_of_file_min                     = 0
+nl_end_of_file                           = ignore
+nl_end_of_file_min                       = 0
+nl_assign_brace                          = ignore
+nl_assign_square                         = ignore
+nl_after_square_assign                   = ignore
+nl_func_var_def_blk                      = 0
+nl_typedef_blk_start                     = 0
+nl_typedef_blk_end                       = 0
+nl_typedef_blk_in                        = 0
+nl_var_def_blk_start                     = 0
+nl_var_def_blk_end                       = 0
+nl_var_def_blk_in                        = 0
+nl_fcall_brace                           = remove
+nl_enum_brace                            = remove
+nl_struct_brace                          = remove
+nl_union_brace                           = remove
+nl_if_brace                              = remove
+nl_brace_else                            = remove
+nl_elseif_brace                          = remove
+nl_else_brace                            = remove
+nl_else_if                               = remove
+nl_brace_finally                         = remove
+nl_finally_brace                         = remove
+nl_try_brace                             = remove
+nl_getset_brace                          = remove
+nl_for_brace                             = remove
+nl_catch_brace                           = remove
+nl_brace_catch                           = remove
+nl_while_brace                           = remove
+nl_scope_brace                           = remove
+nl_unittest_brace                        = remove
+nl_version_brace                         = remove
+nl_using_brace                           = remove
+nl_brace_brace                           = remove
+nl_do_brace                              = remove
+nl_brace_while                           = remove
+nl_switch_brace                          = remove
+
+nl_multi_line_cond                       = false
+nl_multi_line_define                     = false
+nl_before_case                           = false
+nl_before_throw                          = remove
+nl_after_case                            = false
+nl_case_colon_brace                      = remove
+nl_namespace_brace                       = add
+nl_template_class                        = remove
+nl_class_brace                           = add
+nl_class_init_args                       = add
+nl_func_type_name                        = remove
+nl_func_type_name_class                  = remove
+nl_func_scope_name                       = remove
+nl_func_proto_type_name                  = remove
+nl_func_paren                            = remove
+nl_func_def_paren                        = remove
+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_end                         = remove
+nl_func_def_end                          = remove
+nl_func_decl_end_single                  = remove
+nl_func_def_end_single                   = remove
+nl_func_decl_empty                       = remove
+nl_func_def_empty                        = remove
+nl_oc_msg_args                           = false
+nl_fdef_brace                            = add
+nl_return_expr                           = remove
+nl_after_semicolon                       = true
+nl_after_brace_open                      = true
+nl_after_brace_open_cmt                  = true
+nl_after_vbrace_open                     = true
+nl_after_vbrace_open_empty               = true
+nl_after_brace_close                     = true
+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_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
+
+
+# position
+
+pos_arith               = trail
+pos_assign              = trail
+pos_bool                = trail
+pos_compare             = trail
+pos_conditional         = trail
+pos_comma               = trail
+pos_class_comma         = trail
+pos_class_colon         = lead
+
+# blankline
+
+nl_max                              = 2
+nl_after_func_proto                 = 1
+nl_after_func_proto_group           = 2
+nl_after_func_body                  = 2
+nl_after_func_body_class            = 2
+nl_after_func_body_one_liner        = 1
+nl_before_block_comment             = 0
+nl_before_c_comment                 = 0
+nl_before_cpp_comment               = 0
+nl_after_multiline_comment          = true
+nl_after_struct                     = 2
+nl_after_class                      = 2
+nl_before_access_spec               = 2
+nl_after_access_spec                = 1
+nl_comment_func_def                 = 1
+nl_after_try_catch_finally          = 2
+nl_around_cs_property               = 0
+nl_between_get_set                  = 0
+nl_property_brace                   = ignore
+eat_blanks_after_open_brace         = true
+eat_blanks_before_close_brace       = true
+nl_remove_extra_newlines            = 0
+nl_before_return                    = false
+nl_after_return                     = false
+nl_after_annotation                 = ignore
+nl_between_annotation               = ignore
+
+# mod
+
+mod_full_brace_do                           = add
+mod_full_brace_for                          = add
+mod_full_brace_function                     = ignore
+mod_full_brace_if                           = add
+mod_full_brace_if_chain                     = false
+mod_full_brace_nl                           = 0
+mod_full_brace_while                        = add
+mod_full_brace_using                        = ignore
+mod_paren_on_return                         = remove
+mod_pawn_semicolon                          = false
+mod_full_paren_if_bool                      = false
+mod_remove_extra_semicolon                  = true
+mod_add_long_function_closebrace_comment    = 0
+mod_add_long_switch_closebrace_comment      = 0
+mod_add_long_ifdef_endif_comment            = 4
+mod_add_long_ifdef_else_comment             = 0
+mod_sort_import                             = false
+mod_sort_using                              = false
+mod_sort_include                            = false
+mod_move_case_break                         = true
+mod_case_brace                              = ignore
+mod_remove_empty_return                     = false
+
+# comment
+
+cmt_width                           = 120
+cmt_reflow_mode                     = 1
+cmt_indent_multi                    = false
+cmt_c_group                         = false
+cmt_c_nl_start                      = false
+cmt_c_nl_end                        = false
+cmt_cpp_to_c                        = false
+cmt_cpp_group                       = false
+cmt_cpp_nl_start                    = false
+cmt_cpp_nl_end                      = false
+cmt_star_cont                       = false
+cmt_sp_before_star_cont             = 0
+cmt_sp_after_star_cont              = 0
+cmt_multi_check_last                = false
+cmt_insert_file_header              = ""
+cmt_insert_file_footer              = ""
+cmt_insert_func_header              = ""
+cmt_insert_class_header             = ""
+cmt_insert_oc_msg_header            = ""
+cmt_insert_before_preproc           = false
+
+# line_split
+
+code_width                               = 120
+ls_for_split_full                        = false
+ls_func_split_full                       = false
+ls_code_width                            = false
+
+# spacing
+
+sp_arith                   = add
+sp_assign                  = add
+sp_cpp_lambda_assign       = remove
+sp_cpp_lambda_paren        = remove
+sp_assign_default          = add
+sp_before_assign           = ignore
+sp_after_assign            = ignore
+sp_enum_assign             = add
+sp_enum_before_assign      = ignore
+sp_enum_after_assign       = ignore
+sp_pp_concat               = add
+sp_pp_stringify            = remove
+sp_before_pp_stringify     = ignore
+sp_bool                    = add
+sp_compare                 = add
+sp_inside_paren            = remove
+sp_paren_paren             = remove
+sp_balance_nested_parens   = false
+sp_paren_brace             = add
+sp_before_ptr_star         = add
+sp_before_unnamed_ptr_star = add
+sp_between_ptr_star        = remove
+sp_after_ptr_star          = remove
+sp_after_ptr_star_func     = remove
+sp_ptr_star_paren          = remove
+sp_before_ptr_star_func    = add
+sp_before_byref            = add
+sp_before_unnamed_byref    = add
+sp_after_byref             = remove
+sp_after_byref_func        = remove
+sp_before_byref_func       = add
+sp_after_type              = force
+sp_before_template_paren   = ignore
+sp_template_angle          = force
+sp_before_angle            = add
+sp_inside_angle            = remove
+sp_after_angle             = add
+sp_angle_paren             = remove
+sp_angle_word              = add
+sp_angle_shift             = add
+sp_permit_cpp11_shift      = false
+sp_before_sparen           = add
+sp_inside_sparen           = remove
+sp_inside_sparen_close     = remove
+sp_inside_sparen_open      = remove
+sp_after_sparen            = add
+sp_sparen_brace            = add
+sp_invariant_paren         = ignore
+sp_after_invariant_paren   = ignore
+sp_special_semi            = add
+sp_before_semi             = remove
+sp_before_semi_for         = remove
+sp_before_semi_for_empty   = ignore
+sp_after_semi              = add
+sp_after_semi_for          = force
+sp_after_semi_for_empty    = ignore
+sp_before_square           = remove
+sp_before_squares          = remove
+sp_inside_square           = remove
+sp_after_comma             = add
+sp_before_comma            = remove
+sp_paren_comma             = force
+sp_before_ellipsis         = add
+sp_after_class_colon       = add
+sp_before_class_colon      = add
+sp_before_case_colon       = remove
+sp_after_operator          = remove
+sp_after_operator_sym      = remove
+sp_after_cast              = remove
+sp_inside_paren_cast       = remove
+sp_cpp_cast_paren          = remove
+sp_sizeof_paren            = remove
+sp_after_tag               = ignore
+sp_inside_braces_enum      = add
+sp_inside_braces_struct    = add
+sp_inside_braces           = add
+sp_inside_braces_empty     = add
+sp_type_func               = add
+sp_func_proto_paren        = remove
+sp_func_def_paren          = remove
+sp_inside_fparens          = remove
+sp_inside_fparen           = remove
+sp_inside_tparen           = remove
+sp_after_tparen_close      = remove
+sp_square_fparen           = remove
+sp_fparen_brace            = add
+sp_func_call_paren         = remove
+sp_func_call_paren_empty   = remove
+sp_func_call_user_paren    = add
+sp_func_class_paren        = remove
+sp_return_paren            = remove
+sp_attribute_paren         = remove
+sp_defined_paren           = remove
+sp_throw_paren             = remove
+sp_after_throw             = add
+sp_catch_paren             = add
+sp_version_paren           = ignore
+sp_scope_paren             = ignore
+sp_macro                   = add
+sp_macro_func              = add
+sp_else_brace              = add
+sp_brace_else              = add
+sp_brace_typedef           = add
+sp_catch_brace             = add
+sp_brace_catch             = add
+sp_finally_brace           = add
+sp_brace_finally           = add
+sp_try_brace               = add
+sp_getset_brace            = add
+sp_before_dc               = remove
+sp_after_dc                = remove
+sp_d_array_colon           = ignore
+sp_not                     = remove
+sp_inv                     = remove
+sp_addr                    = remove
+sp_member                  = remove
+sp_deref                   = remove
+sp_sign                    = remove
+sp_incdec                  = remove
+sp_before_nl_cont          = add
+sp_after_oc_scope          = add
+sp_after_oc_colon          = remove
+sp_before_oc_colon         = remove
+sp_after_oc_dict_colon     = add
+sp_before_oc_dict_colon    = remove
+sp_after_send_oc_colon     = remove
+sp_before_send_oc_colon    = remove
+sp_after_oc_type           = remove
+sp_after_oc_return_type    = remove
+sp_after_oc_at_sel         = remove
+sp_after_oc_at_sel_parens  = add
+sp_inside_oc_at_sel_parens = remove
+sp_before_oc_block_caret   = remove
+sp_after_oc_block_caret    = remove
+sp_after_oc_msg_receiver   = add
+sp_after_oc_property       = add
+sp_cond_colon              = add
+sp_cond_question           = add
+sp_case_label              = ignore
+sp_range                   = ignore
+sp_after_for_colon         = ignore
+sp_before_for_colon        = ignore
+sp_extern_paren            = ignore
+sp_cmt_cpp_start           = add
+sp_endif_cmt               = add
+sp_after_new               = add
+sp_before_tr_emb_cmt       = add
+sp_num_before_tr_emb_cmt   = 0
+sp_annotation_paren        = ignore
diff --git a/.vimrc b/.vimrc
index e82929e..ed613f8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -265,7 +265,7 @@ let Tlist_Exit_OnlyWindow    = 0
 let Tlist_Enable_Fold_Column = 1
 let Tlist_Auto_Open          = 0
 let Tlist_Auto_Update        = 1
-let Tlist_WinWidth           = 50
+let Tlist_WinWidth           = 70

 "****************************************
 " yankring
diff --git a/setup.sh b/setup.sh
index 9a2d8a7..b7518ef 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-DOT_FILES=( .bashrc .zsh .zshrc .gitconfig .gitignore .inputrc .vim .vimrc .xvimrc .gemrc )
+DOT_FILES=( .bashrc .zsh .zshrc .gitconfig .gitignore .inputrc .vim .vimrc .xvimrc .gemrc .uncrc )

 for file in ${DOT_FILES[@]}
 do
Merge branch 'master' of github.com:munkkya/.dotfiles