summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
m---------vim/bundle/yankring0
-rw-r--r--vimrc9
4 files changed, 0 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index e490527..d3317b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ vim/.netrwhist
vim/.VimballRecord
vim/ctrlp/
vim/fuf-data/
-vim/yankring-data/
vim/undo/
newsbeuter/cache.db
newsbeuter/cache.db.lock
diff --git a/.gitmodules b/.gitmodules
index f0f4a23..d726c46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,9 +16,6 @@
[submodule "vim/bundle/git"]
path = vim/bundle/git
url = git://github.com/tpope/vim-git.git
-[submodule "vim/bundle/yankring"]
- path = vim/bundle/yankring
- url = git://github.com/vim-scripts/YankRing.vim.git
[submodule "vim/bundle/perl"]
path = vim/bundle/perl
url = git://github.com/petdance/vim-perl.git
diff --git a/vim/bundle/yankring b/vim/bundle/yankring
deleted file mode 160000
-Subproject 8ebc225b364887c0557ab47ab2ca752a70123be
diff --git a/vimrc b/vimrc
index 9692def..08d2b4d 100644
--- a/vimrc
+++ b/vimrc
@@ -585,15 +585,6 @@ let g:Foldtext_tex_enable = 1
let g:Foldtext_cpp_enable = 1
let g:Foldtext_perl_enable = 1
" }}}
-" Yankring {{{
-let g:yankring_history_dir = '~/.vim/yankring-data'
-let g:yankring_clipboard_monitor = 0
-let g:yankring_replace_n_pkey = '-'
-let g:yankring_replace_n_nkey = '_'
-function! YRRunAfterMaps()
- nnoremap <silent> Y :<C-U>YRYankCount 'y$'<CR>
-endfunction
-" }}}
" zencoding {{{
let g:user_zen_settings = {
\ 'indentation' : ' ',