[from now] 2013/05/28 11:58:52

diff --git a/.vimrc b/.vimrc
index d844629..7ba1bdc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -8,12 +8,12 @@
 " git clone --recursive git@github.com:munkkya/.dotfiles.git
 " sh setup.sh
 "
-" " 古いやり方
-" " git clone https://github.com/munkkya/.dotfiles
-" " cd .dotfiles
-" " git submodule init
-" " git submodule update
-" " sh setup.sh
+""" 古いやり方
+""" git clone https://github.com/munkkya/.dotfiles
+""" cd .dotfiles
+""" git submodule init
+""" git submodule update
+""" sh setup.sh
 "
 " cd .vim/bundle/vimproc
 " make -f .vim/bundle/vimproc/make_???.mak
@@ -98,7 +98,6 @@ Bundle 'tomtom/tcomment_vim'
 Bundle 'godlygeek/tabular'
 Bundle 'banyan/recognize_charcode.vim'
 Bundle 'tomasr/molokai'
-
 Bundle 'kchmck/vim-coffee-script'

@@ -180,7 +179,6 @@ autocmd FileType * set formatoptions-=ro
 autocmd InsertLeave * set nopaste

 " Indent
-autocmd FileType cpp        setlocal sw=4 sts=4 ts=4
 autocmd FileType css        setlocal sw=2 sts=2 ts=2
 autocmd FileType less       setlocal sw=2 sts=2 ts=2
 autocmd FileType html       setlocal sw=2 sts=2 ts=2
@@ -191,6 +189,7 @@ autocmd FileType haml       setlocal sw=2 sts=2 ts=2
 autocmd FileType vim        setlocal sw=2 sts=2 ts=2
 autocmd FileType yaml       setlocal sw=2 sts=2 ts=2
 autocmd FileType scala      setlocal sw=2 sts=2 ts=2
+" autocmd FileType cpp        setlocal sw=4 sts=4 ts=4

 " Syntax
 colorscheme molokai
@@ -199,6 +198,8 @@ highlight PmenuSel       ctermbg=cyan ctermfg=black guibg=cyan guifg=black " メ
 highlight MatchParen     ctermbg=240
 highlight Visual         ctermbg=237
 highlight Search         guifg=#FFFFFF guibg=#95A3A4
+highlight StatusLine     ctermfg=60  ctermbg=232 guifg=#5F5F87 guibg=#080808
+highlight StatusLineNC   ctermfg=238 ctermbg=253 guifg=#455354 guibg=fg

 "}}}
[from now] 2013/05/28 12:11:20

diff --git a/.vimrc b/.vimrc
index 7ba1bdc..1d9972e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -344,9 +344,10 @@ let g:vimfiler_safe_mode_by_default = 0

 autocmd FileType vimfiler call s:vimfiler_settings()
 function! s:vimfiler_settings()
-  nmap <silent><buffer><expr><CR> vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
-  nmap <silent><buffer><expr>o    vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
-  nmap <silent><buffer> q         <Plug>(vimfiler_exit)
+  nmap <silent><buffer><expr><CR>     vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
+  nmap <silent><buffer><expr>o        vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
+  nmap <silent><buffer><Space>        <Plug>(vimfiler_toggle_mark_current_line)
+  nmap <silent><buffer> q             <Plug>(vimfiler_exit)
 endfunction

 "****************************************
[from now] 2013/05/28 12:11:48

diff --git a/.vimrc b/.vimrc
index 1d9972e..858d682 100644
--- a/.vimrc
+++ b/.vimrc
@@ -346,7 +346,6 @@ autocmd FileType vimfiler call s:vimfiler_settings()
 function! s:vimfiler_settings()
   nmap <silent><buffer><expr><CR>     vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
   nmap <silent><buffer><expr>o        vimfiler#smart_cursor_map("\<Plug>(vimfiler_expand_tree)", "\<Plug>(vimfiler_edit_file)")
-  nmap <silent><buffer><Space>        <Plug>(vimfiler_toggle_mark_current_line)
   nmap <silent><buffer> q             <Plug>(vimfiler_exit)
 endfunction
Merge branch 'master' of github.com:munkkya/.dotfiles