[from now] 2012/10/03 14:19:15

diff --git a/.vimrc b/.vimrc
index 4e136c6..9249720 100644
--- a/.vimrc
+++ b/.vimrc
@@ -69,7 +69,6 @@ set rtp+=~/.vim/vundle.git/
 call vundle#rc()

 Bundle 'zefei/buftabs'
-Bundle 'vim-scripts/bufferlist.vim'
 Bundle 'vim-scripts/mru.vim'
 Bundle 'vim-scripts/sudo.vim'
 Bundle 'vim-scripts/taglist.vim'
@@ -195,8 +194,8 @@ set     ignorecase                      " 大文字小文字無視
 set     expandtab                       " タブを空白にする
 set     vb t_vb=                        " ビジュアルベル
 set     hidden                          " 編集中でもファイルを開けるようにする
-" set     lazyredraw                      " コマンド実行中は再描画しない
-" set     ttyfast                         " 高速ターミナル接続を行う
+set     lazyredraw                      " コマンド実行中は再描画しない
+set     ttyfast                         " 高速ターミナル接続を行う
 set     virtualedit& virtualedit+=block " 矩形選択で自由に移動する

 " 補完
@@ -233,10 +232,12 @@ nnoremap      L          $
 vnoremap      L          $
 nnoremap      x          "_x
 vnoremap      x          "_x
+nnoremap      c          <Nop>
+vnoremap      c          <Nop>
+nnoremap      t          <Nop>
+vnoremap      t          <Nop>
 nnoremap      n          nzz
 nnoremap      N          Nzz
-nnoremap      t          <Nop>
-nnoremap      f          <Nop>
 nnoremap      U          :<C-u>GundoToggle<CR>
 nnoremap      p          :set paste!<CR>p
 nnoremap      <C-k><C-i> :set paste!<CR>
@@ -253,11 +254,11 @@ nnoremap      <C-k><C-k> @q
 nnoremap      Q          q
 nnoremap      q          :close<CR>
 nnoremap      ;          :
-nnoremap      fr         :source $MYVIMRC<CR>
-nnoremap      fR         :e      $MYVIMRC<CR>
-nnoremap      fe         :e!<CR>
-nnoremap      fw         :w!<CR>
-nnoremap      fq         :q!<CR>
+nnoremap      cr         :source $MYVIMRC<CR>
+nnoremap      cR         :e      $MYVIMRC<CR>
+nnoremap      ce         :e!<CR>
+nnoremap      cw         :w!<CR>
+nnoremap      cq         :q!<CR>
 nnoremap      -          20<C-w>+
 inoremap      <C-b>      <Left>
 inoremap      <C-f>      <Right>
@@ -266,13 +267,6 @@ inoremap      <C-a>      <Home>
 inoremap      <C-h>      <Backspace>
 inoremap      <C-d>      <Del>

-" syntaxのトグル
-nnoremap      fl         :if exists("g:syntax_on") <Bar>
-                       \   syntax off <Bar>
-                       \ else <Bar>
-                       \   syntax enable <Bar>
-                       \ endif <CR>
-
 " Ex-modeでの<C-p><C-n>をzshのヒストリ補完っぽくする
 cnoremap <C-p>   <Up>
 cnoremap <C-n>   <Down>
@@ -365,17 +359,15 @@ endif

 "****************************************
 " nerdtree
-nnoremap    fn         :NERDTree<CR>
+nnoremap    cn         :NERDTree<CR>

 "****************************************
 " nerdcommenter
 let NERDSpaceDelims = 1
-nmap    cc         \cc
-nmap    cs         \cs
-nmap    cu         \cu
-vmap    cc         \cc
-vmap    cs         \cs
-vmap    cu         \cu
+nmap    co         <plug>NERDCommenterToggle
+nmap    cO         \cc
+vmap    co         <plug>NERDCommenterToggle
+vmap    cO         \cc

 "****************************************
 " tabular
@@ -395,20 +387,21 @@ let g:toggle_pairs = { 'yes':'no', 'no':'yes', 'enable':'disable', 'disable':'en

 "****************************************
 " buftabs
-let g:buftabs_only_basename=1
-let g:buftabs_in_statusline=1
-let g:buftabs_active_highlight_group="Buftabs"
-highlight Buftabs ctermbg=33
+let g:buftabs_only_basename = 1
+let g:buftabs_in_statusline = 1
+let g:buftabs_active_highlight_group = "Buftabs"
+highlight Buftabs ctermbg = 33

 "****************************************
 " mru.vim
 nnoremap <silent> <C-k><C-l> :<C-u>MRU<CR>
+nnoremap <silent> cl :<C-u>MRU<CR>
 let MRU_Window_Height   = 30
 let MRU_Max_Entries     = 10000

 "****************************************
 " taglist.vim
-nnoremap <silent> ft    :Tlist<CR>            " taglistを開くショットカットキー
+nnoremap <silent> ct    :Tlist<CR>            " taglistを開くショットカットキー
 set tags=tags
 let Tlist_Ctags_Cmd = "/usr/local/bin/ctags"  " ctagsのパス
 let Tlist_GainFocus_On_ToggleOpen = 1         " 表示時にフォーカスを移す
@@ -419,17 +412,16 @@ let Tlist_WinWidth = 30
 let Tlist_Auto_Update = 1

 " 以下の設定はtaglist.vimからコピー
-"let s:tlist_php_settings = 'php;c:class;d:constant;f:function'
-let tlist_php_settings = 'php;c:class;d:constant;f:function'
+let tlist_php_settings    = 'php;c:class;d:constant;f:function'
 let tlist_python_settings = 'python;c:class;m:member;f:function'
-let tlist_ruby_settings = 'ruby;c:class;f:method;F:function;m:singleton method'
+let tlist_ruby_settings   = 'ruby;c:class;f:method;F:function;m:singleton method'

 "****************************************
 " unite.vim
 " nnoremap <silent> fa  :<C-u>UniteWithCurrentDir -no-split -buffer-name=files buffer file_mru bookmark file<CR>
 " nnoremap <silent> fd  :<C-u>Unite               -no-split -buffer-name=files file<CR>
 " nnoremap <silent> fc  :<C-u>UniteWithBufferDir  -no-split -buffer-name=files file<CR>
-nnoremap <silent> fu  :<C-u>Unite               -no-split buffer file_mru<CR>
+nnoremap <silent> cu  :<C-u>Unite               -no-split buffer file_mru<CR>

 "****************************************
 " vimshell.vim
@@ -437,9 +429,9 @@ let g:vimshell_editor_command = '/usr/local/bin/mvim'

 "****************************************
 " vimfiler.vim
-nnoremap <silent> f.  :<C-u>VimFilerBufferDir   -quit<CR>
-nnoremap <silent> ff  :<C-u>VimFilerCurrentDir  -quit<CR>
-nnoremap <silent> fs  :<C-u>VimShell<CR>
+nnoremap <silent> c.  :<C-u>VimFilerBufferDir   -quit<CR>
+nnoremap <silent> cc  :<C-u>VimFilerCurrentDir  -quit<CR>
+nnoremap <silent> cs  :<C-u>VimShell<CR>

 if executable('grep')
   let g:unite_source_grep_command = 'grep'
@@ -457,10 +449,5 @@ function! s:vimfiler_settings()
   nmap <silent><buffer> q         <Plug>(vimfiler_exit)
 endfunction

-"****************************************
-" bufferlist.vim
-nnoremap <silent> fb  :call BufferList()<CR>
-
-

 "}}}