summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
m---------.vim/bundle/neoyank.vim0
-rw-r--r--.vimrc4
3 files changed, 7 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 2e8d09e..e61305d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -121,3 +121,6 @@
[submodule ".vim/bundle/vim-gitgutter"]
path = .vim/bundle/vim-gitgutter
url = https://github.com/airblade/vim-gitgutter.git
+[submodule ".vim/bundle/neoyank.vim"]
+ path = .vim/bundle/neoyank.vim
+ url = https://github.com/Shougo/neoyank.vim.git
diff --git a/.vim/bundle/neoyank.vim b/.vim/bundle/neoyank.vim
new file mode 160000
+Subproject ea3cd47ccb40cb2e26cb607d28475aa0fdb26fe
diff --git a/.vimrc b/.vimrc
index 12d38e3..62201bb 100644
--- a/.vimrc
+++ b/.vimrc
@@ -81,6 +81,7 @@ Plugin 'honza/vim-snippets'
Plugin 'Shougo/unite.vim'
Plugin 'Shougo/vimproc.vim'
Plugin 'Shougo/vimshell.vim'
+Plugin 'Shougo/neoyank.vim'
Plugin 'tpope/vim-unimpaired'
Plugin 'tpope/vim-fugitive'
@@ -276,6 +277,9 @@ nnoremap <leader>qq :<C-u>Unite -buffer-name=files -start-insert file_rec/asyn
nnoremap <leader>y :<C-u>Unite -buffer-name=yank history/yank<cr>
nnoremap <leader>b :<C-u>Unite -buffer-name=buffer buffer<cr>
+" neoyank
+let g:neoyank#file = $HOME.'/.vim/yankring.txt'
+
" completion
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags