From d5f8d934cf6aad67f57a10aac88e34db280c5017 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 26 Dec 2018 18:17:23 +1300 Subject: Remove repeat.vim and surround.vim Getting in the habit of using , and ; properly. This is the last of the third-party code in my ~/.vim! --- .gitmodules | 14 +++----------- README.md | 6 ------ lint/vim.sh | 19 +------------------ vim/after/plugin/surround.vim | 9 --------- vim/bundle/repeat | 1 - vim/bundle/surround | 1 - 6 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 vim/after/plugin/surround.vim delete mode 160000 vim/bundle/repeat delete mode 160000 vim/bundle/surround diff --git a/.gitmodules b/.gitmodules index 6d232f3e..f13f3697 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -# My Vim plugins +# Vim plugins [submodule "vim/bundle/big_file_options"] path = vim/bundle/big_file_options url = https://sanctum.geek.nz/code/vim-big-file-options.git @@ -72,7 +72,7 @@ path = vim/bundle/vimrc_reload_filetype url = https://sanctum.geek.nz/code/vim-vimrc-reload-filetype.git -# My Vim filetype plugins +# Vim filetype plugins [submodule "vim/bundle/diff_prune"] path = vim/bundle/diff_prune url = https://sanctum.geek.nz/code/vim-diff-prune.git @@ -83,18 +83,10 @@ path = vim/bundle/perl_version_bump url = https://sanctum.geek.nz/code/vim-perl-version-bump.git -# My Vim colorschemes +# Vim colorschemes [submodule "vim/bundle/juvenile"] path = vim/bundle/juvenile url = https://sanctum.geek.nz/code/vim-juvenile.git [submodule "vim/bundle/sahara"] path = vim/bundle/sahara url = https://sanctum.geek.nz/code/vim-sahara.git - -# Others' Vim plugins -[submodule "vim/bundle/repeat"] - path = vim/bundle/repeat - url = https://sanctum.geek.nz/clone/vim-repeat.git -[submodule "vim/bundle/surround"] - path = vim/bundle/surround - url = https://sanctum.geek.nz/clone/vim-surround.git diff --git a/README.md b/README.md index 67272653..b66b8a13 100644 --- a/README.md +++ b/README.md @@ -367,12 +367,6 @@ They eventually get either discarded or spun off into their own repositories, added to this repository as submodules under `vim/bundle` instead, and uploaded to [vim.org](https://www.vim.org/account/profile.php?user_id=73687). -I still use two third-party plugins: Tim Pope's -[repeat.vim](https://www.vim.org/scripts/script.php?script_id=2136) and -[surround.vim](https://www.vim.org/scripts/script.php?script_id=1697). In my -opinion, these plugins are so fundamental and useful that they should have been -implemented in or bundled with Vim itself many years ago. - #### Filetype plugins I also define a few rules specific to file types I often edit in diff --git a/lint/vim.sh b/lint/vim.sh index bd8e73af..b3b2e261 100644 --- a/lint/vim.sh +++ b/lint/vim.sh @@ -1,19 +1,2 @@ -# Build an argument list of checks to make -set -- -for vim in vim/* vim/bundle/* ; do - [ -e "$vim" ] || continue - case $vim in - - # Skip third-party plugins - vim/bundle) ;; - vim/bundle/repeat) ;; - vim/bundle/surround) ;; - - # Check everything else - *) set -- "$@" "$vim" ;; - - esac -done - # Run check -vint -s -- "$@" || exit +vint -s -- vim || exit diff --git a/vim/after/plugin/surround.vim b/vim/after/plugin/surround.vim deleted file mode 100644 index 800bc38d..00000000 --- a/vim/after/plugin/surround.vim +++ /dev/null @@ -1,9 +0,0 @@ -" Remove surround.vim's insert mode maps -if !exists('g:loaded_surround') - finish -endif -iunmap ISurround -iunmap Isurround -iunmap S -iunmap s -iunmap diff --git a/vim/bundle/repeat b/vim/bundle/repeat deleted file mode 160000 index 43d2678f..00000000 --- a/vim/bundle/repeat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 43d2678fa59d068c815d8298331c195e850ff5a7 diff --git a/vim/bundle/surround b/vim/bundle/surround deleted file mode 160000 index 59706887..00000000 --- a/vim/bundle/surround +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 597068870b8f093a8b2d11536c62ff31222ee8d0 -- cgit v1.2.3