aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-12-26 18:17:23 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-12-26 18:24:10 +1300
commitd5f8d934cf6aad67f57a10aac88e34db280c5017 (patch)
treec2775b29b03180c069312ff3a82f436220e0e94b
parentForce 'ttymouse' off a little more carefully (diff)
downloaddotfiles-d5f8d934cf6aad67f57a10aac88e34db280c5017.tar.gz
dotfiles-d5f8d934cf6aad67f57a10aac88e34db280c5017.zip
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!
-rw-r--r--.gitmodules14
-rw-r--r--README.md6
-rw-r--r--lint/vim.sh19
-rw-r--r--vim/after/plugin/surround.vim9
m---------vim/bundle/repeat0
m---------vim/bundle/surround0
6 files changed, 4 insertions, 44 deletions
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 <Plug>ISurround
-iunmap <Plug>Isurround
-iunmap <C-G>S
-iunmap <C-G>s
-iunmap <C-S>
diff --git a/vim/bundle/repeat b/vim/bundle/repeat
deleted file mode 160000
-Subproject 43d2678fa59d068c815d8298331c195e850ff5a
diff --git a/vim/bundle/surround b/vim/bundle/surround
deleted file mode 160000
-Subproject 597068870b8f093a8b2d11536c62ff31222ee8d