aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-12-26 18:32:34 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-12-26 18:32:34 +1300
commite23443b927b159a3fcd134f96c208c74e4ad6fe2 (patch)
tree49ee3226cad80af63c40c07dbf1d090a9e582b15
parent6d119607d8ce870897e5d91328598eba7b1203f0 (diff)
parenta99b834ad05c7c3c6aaaffc4918a38cad2af6124 (diff)
downloaddotfiles-e23443b927b159a3fcd134f96c208c74e4ad6fe2.tar.gz
Merge branch 'release/v4.0.0'v4.0.0
* release/v4.0.0: Switch to two-space sentences Remove repeat.vim and surround.vim Force 'ttymouse' off a little more carefully No longer need a longer 'timeoutlen' in Vim Include /usr/tmp in 'backupskip' Factor out vimrc user 'runtimepath' switching
-rw-r--r--.gitmodules14
-rw-r--r--README.md6
-rw-r--r--VERSION4
-rw-r--r--lint/vim.sh19
-rw-r--r--vim/after/plugin/surround.vim9
m---------vim/bundle/repeat0
m---------vim/bundle/surround0
-rw-r--r--vim/vimrc43
8 files changed, 26 insertions, 69 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/VERSION b/VERSION
index f88e3e2b..22c48d03 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v3.6.1
-Thu Dec 20 02:08:26 UTC 2018
+tejr dotfiles v4.0.0
+Wed Dec 26 05:31:40 UTC 2018
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
diff --git a/vim/vimrc b/vim/vimrc
index 69f63083..122a108d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -4,6 +4,15 @@
" Undo anything the operating system's vimrc may have broken
runtime system.vim
+" Set an environment variable for the user runtime directory
+if !exists('$MYVIMRUNTIME')
+ if has('win32') || has('win64')
+ let $MYVIMRUNTIME = expand('~/vimfiles')
+ else
+ let $MYVIMRUNTIME = expand('~/.vim')
+ endif
+endif
+
" Load filetype settings, plugins, and maps
if has('autocmd')
let g:maplocalleader = ','
@@ -49,16 +58,13 @@ set backspace+=start " The start of current insertion
" Try to keep backups in one system-appropriate dir
set backup
-if has('win32') || has('win64')
- set backupdir^=~/vimfiles/cache/backup
-else
- set backupdir^=~/.vim/cache/backup
-endif
+set backupdir^=$MYVIMRUNTIME/cache/backup
" Add some paths not to back up
if has('unix')
set backupskip^=/dev/shm/* " Shared memory RAM disk
- set backupskip^=/var/tmp/* " Debian's $TMPDIR for sudoedit(8)
+ set backupskip^=/usr/tmp/* " Hardcoded path for `sudo -e`
+ set backupskip^=/var/tmp/* " Hardcoded path for `sudo -e`
endif
" Indent wrapped lines if supported
@@ -78,12 +84,12 @@ endif
" Give me a prompt instead of just rejecting risky :write, :saveas
set confirm
+" Require two spaces for sentence objects
+" Yes, I have become a filthy two-spacer
+set cpoptions+=J
+
" Try to keep swapfiles in one system-appropriate dir
-if has('win32') || has('win64')
- set directory^=~/vimfiles/cache/swap//
-else
- set directory^=~/.vim/cache/swap//
-endif
+set directory^=$MYVIMRUNTIME/cache/swap//
" Use UTF-8 if we can and env LANG didn't tell us not to
if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1'
@@ -133,9 +139,6 @@ set include=
" Show search matches as I type my pattern
set incsearch
-" Don't join lines with two spaces at the end of sentences
-set nojoinspaces
-
" Don't show a statusline if there's only one window
" This is the Vim default, but NeoVim changed it
if &laststatus != 1
@@ -187,22 +190,16 @@ set showbreak=...
set splitbelow " Below the current window, not above
set splitright " Right of the current window, not left
-" Give me a bit longer to complete mappings
-set timeoutlen=3000
-
" No terminal mouse, even if we could
-if exists('+ttymouse')
+" The manual says to set 't_RV', but I don't like that
+if exists('+ttymouse') && &ttymouse !=# ''
set ttymouse=
endif
" Keep undo files, hopefully in a dedicated directory
if has('persistent_undo')
set undofile
- if has('win32') || has('win64')
- set undodir^=~/vimfiles/cache/undo//
- else
- set undodir^=~/.vim/cache/undo//
- endif
+ set undodir^=$MYVIMRUNTIME/cache/undo//
endif
" Wildmenu settings; see also plugin/wildignore.vim