[from now] 2013/06/06 17:26:11

diff --git a/.vimrc b/.vimrc
index 4c89171..5eb7ccf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -90,9 +90,10 @@ Bundle 'vim-scripts/mru.vim'
 Bundle 'vim-scripts/sudo.vim'
 Bundle 'vim-scripts/taglist.vim'
 Bundle 'vim-scripts/YankRing.vim'
-Bundle 'Shougo/vimproc'
+Bundle 'vim-scripts/AutoComplPop'
+Bundle 'Shougo/vimproc.vim'
 Bundle 'Shougo/unite.vim'
-Bundle 'Shougo/vimfiler'
+Bundle 'Shougo/vimfiler.vim'
 Bundle 'thinca/vim-qfreplace'
 Bundle 'mattn/zencoding-vim'
 Bundle 'tomtom/tcomment_vim'
@@ -154,7 +155,8 @@ set     lazyredraw                      " コマンド実行中は再描画し
 set     ttyfast                         " 高速ターミナル接続を行う
 set     virtualedit& virtualedit+=block " 矩形選択で自由に移動する
 set     tags+=tags;                     " タグファイル
-set     mouse=a
+set     mouse=a                         " マウスホイール有効
+set     completeopt=menuone             " 補完オプション
 set     wildmenu                        " コマンド補完を強化
 set     wildchar=<tab>                  " コマンド補完を開始するキー
 set     wildmode=list:full              " リスト表示，最長マッチ
@@ -261,13 +263,15 @@ cnoremap <expr> / getcmdtype() == '/' ? '\/' : '/'
 "****************************************
 " tcomment
 let g:tcommentOptions = {'col': 1}
-nmap    <Space>/         :TComment<CR>
-vmap    <Space>/         :TComment<CR>
+nnoremap    <Space>/         :TComment<CR>
+vnoremap    <Space>/         :TComment<CR>
+

 "****************************************
 " tabular
 vnoremap    <Space>t         :Tab/

+
 "****************************************
 " taglist
 nnoremap <silent> <Space>r  :<C-u>Tlist<CR>
@@ -283,11 +287,13 @@ function! g:wipeout_tlist_buffer()
   endif
 endfunction

+
 "****************************************
 " yankring
 let g:yankring_history_file = '.yankring'
 let g:yankring_n_keys = 'Y D'

+
 "****************************************
 " vim-indent-guides
 let g:indent_guides_enable_on_vim_startup = 1
@@ -296,26 +302,6 @@ let g:indent_guides_auto_colors           = 0
 autocmd VimEnter,Colorscheme * :highlight IndentGuidesOdd  ctermbg=234 guibg=234
 autocmd VimEnter,Colorscheme * :highlight IndentGuidesEven ctermbg=236 guibg=236

-"****************************************
-" syntastic
-" let g:syntastic_mode_map = {
-"       \ 'mode': 'passive',
-"       \ 'active_filetypes' : ['php', 'python', 'ruby', 'haskell'],
-"       \ 'passive_filetypes': ['cpp'] }
-" let g:syntastic_enable_signs = 1
-" let g:syntastic_quiet_warnings = 1
-
-"****************************************
-" quickrun
-" let g:quickrun_config = {
-"       \   "_" : {
-"       \       "outputter/buffer/into"     : 0,
-"       \       "outputter/buffer/split"    : ":botright 8sp",
-"       \       "runner"                    : "vimproc",
-"       \       "runner/vimproc/updatetime" : 50,
-"       \   }
-"       \}
-" nnoremap  <Space>b       :QuickRun<CR>

 "****************************************
 " buftabs
@@ -334,22 +320,20 @@ let g:buftabs_marker_modified   = '*'
 "****************************************
 " mru.vim
 nnoremap <silent> <C-k><C-l> :<C-u>MRU<CR>
-let MRU_Window_Height   = 30
 let MRU_Max_Entries     = 10000
+let MRU_Window_Height   = 30
+

 "****************************************
 " unite.vim
-nnoremap <silent> <Space>.  :<C-u>VimFilerBufferDir  -quit<CR>
-nnoremap <silent> <Space>u  :<C-u>Unite -no-split file_mru<CR>
-nnoremap <silent> <Space>p  :<C-u>Unite -no-split file_rec<CR>
+nnoremap <silent> <Space>p   :<C-u>Unite -no-split file_rec<CR>
+nnoremap <silent> <Space>u   :<C-u>Unite -no-split file_mru<CR>

-"****************************************
-" unite-outline.vim
-" nnoremap <silent> <Space>r  :<C-u>Unite -no-split outline<CR>

 "****************************************
 " vimfiler.vim
-nnoremap <silent> <Space>c  :<C-u>VimFilerCurrentDir -quit<CR>
+nnoremap <silent> <Space>.   :<C-u>VimFilerBufferDir  -quit<CR>
+nnoremap <silent> <Space>c   :<C-u>VimFilerCurrentDir -quit<CR>

 " if executable('grep')
   " let g:unite_source_grep_command       = 'grep'
@@ -368,6 +352,13 @@ function! s:vimfiler_settings()
 endfunction

+"****************************************
+" autocomplpop
+" 補完決定
+inoremap <expr><TAB> pumvisible() ? "<C-y>"     : "<TAB>"
+" 補完消去して改行
+inoremap <expr><CR>  pumvisible() ? "<C-e><CR>" : "<CR>"
+

 "****************************************
 " neocomplcache
@@ -394,8 +385,11 @@ endfunction
 " " SmartCase補完
 " let g:neocomplcache_enable_smart_case = 0
 "
-" " inoremap <expr><TAB> pumvisible() ? neocomplcache#close_popup() : "<TAB>"
-" " inoremap <expr><CR>  pumvisible() ? neocomplcache#close_popup() : "<CR>"
+" inoremap <expr><TAB> pumvisible() ? neocomplcache#close_popup() : "<TAB>"
+" inoremap <expr><CR>  pumvisible() ? neocomplcache#close_popup() : "<CR>"
+" snoremap <expr><TAB> pumvisible() ? neocomplcache#close_popup() : "<TAB>"
+" snoremap <expr><CR>  pumvisible() ? neocomplcache#close_popup() : "<CR>"
+

 "****************************************
 " neosnippet
@@ -421,11 +415,36 @@ endfunction
 "       \   '_' : 1,
 "       \ }

+
 "****************************************
 " zencoding
 " complete tags using omnifunc
 " let g:use_zen_complete_tag = 1

+
+"****************************************
+" syntastic
+" let g:syntastic_mode_map = {
+"       \ 'mode': 'passive',
+"       \ 'active_filetypes' : ['php', 'python', 'ruby', 'haskell'],
+"       \ 'passive_filetypes': ['cpp'] }
+" let g:syntastic_enable_signs = 1
+" let g:syntastic_quiet_warnings = 1
+
+
+"****************************************
+" quickrun
+" let g:quickrun_config = {
+"       \   "_" : {
+"       \       "outputter/buffer/into"     : 0,
+"       \       "outputter/buffer/split"    : ":botright 8sp",
+"       \       "runner"                    : "vimproc",
+"       \       "runner/vimproc/updatetime" : 50,
+"       \   }
+"       \}
+" nnoremap  <Space>b       :QuickRun<CR>
+
+
 "****************************************
 " uncrustify
 autocmd FileType cpp nnoremap <silent><buffer> <Space>l :call Uncrustify('cpp')<CR>
@@ -470,5 +489,4 @@ function! Uncrustify(language)
 endfunction

-
 "}}}