[from now] 2012/09/25 12:53:32

diff --git a/.vimrc b/.vimrc
index 9a2b2ec..d9a2f3c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -46,7 +46,7 @@
 " yss= <%= %>
 " yss- <%  %>
 "
-" :setなどのアウトプットに対して検索する
+" :setなどのアウトプットに対して検索をかける
 " :Unite output:set
 "
 " grep置換
@@ -223,15 +223,17 @@ highlight CursorLine ctermbg=236 guibg=#333333
 " Mapping
 "========================================
 "{{{
-nnoremap      H ^
-vnoremap      H ^
-nnoremap      L $
-vnoremap      L $
-nnoremap      x "_x
-vnoremap      x "_x
-nnoremap      n nzz
-nnoremap      N Nzz
-nnoremap      U :<C-u>GundoToggle<CR>
+nnoremap      H          ^
+vnoremap      H          ^
+nnoremap      L          $
+vnoremap      L          $
+nnoremap      x          "_x
+vnoremap      x          "_x
+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>
 nnoremap      <C-k><C-m> :w<CR>:!make<CR>
@@ -259,11 +261,6 @@ inoremap      <C-e>      <End>
 inoremap      <C-a>      <Home>
 inoremap      <C-h>      <Backspace>
 inoremap      <C-d>      <Del>
-nnoremap      t          <Nop>
-nnoremap      tt         <C-]>          " 飛ぶ
-nnoremap      tn         :<C-u>tag<CR>  " 進む
-nnoremap      tp         :<C-u>pop<CR>  " 戻る
-nnoremap      tl         :<C-u>tags<CR> " 履歴一覧

 " Ex-modeでの<C-p><C-n>をzshのヒストリ補完っぽくする
 cnoremap <C-p>   <Up>
@@ -405,11 +402,13 @@ highlight Buftabs ctermbg=33

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

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

-nnoremap <silent> ft    :Tlist<CR>            " taglistを開くショットカットキー
+" 以下の設定はtaglist.vimからコピー
+let s:tlist_php_settings = 'php;c:class;d:constant;v:variable;f:function'
+let s:tlist_python_settings = 'python;c:class;m:member;f:function'
+let s:tlist_ruby_settings = 'ruby;c:class;f:method;F:function;m:singleton method'

 "****************************************
 " unite.vim
-nnoremap [unite]   <Nop>
-nmap   f [unite]
-" nnoremap <silent> [unite]a  :<C-u>UniteWithCurrentDir -no-split -buffer-name=files buffer file_mru bookmark file<CR>
-" nnoremap <silent> [unite]d  :<C-u>Unite               -no-split -buffer-name=files file<CR>
-" nnoremap <silent> [unite]c  :<C-u>UniteWithBufferDir  -no-split -buffer-name=files file<CR>
-" nnoremap <silent> [unite]u  :<C-u>Unite               -no-split buffer file_mru<CR>
-nnoremap <silent> [unite].  :<C-u>VimFilerBufferDir   -quit<CR>
-nnoremap <silent> [unite]f  :<C-u>VimFilerCurrentDir  -quit<CR>
-nnoremap <silent> [unite]s  :<C-u>VimShell<CR>
-nnoremap <silent> [unite]u  :<C-u>MRU<CR>
+" 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>
+
+"****************************************
+" vimshell.vim
+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>

 if executable('grep')
   let g:unite_source_grep_command = 'grep'