diff options
-rw-r--r-- | .gitmodules | 18 | ||||
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/after/ftplugin/sh.vim | 3 | ||||
m--------- | vim/bundle/auto_cache_dirs | 0 | ||||
m--------- | vim/bundle/shebang_create_exec | 0 | ||||
-rw-r--r-- | vim/plugin/shebang_create_exec.vim | 35 | ||||
-rw-r--r-- | vim/vimrc | 40 |
8 files changed, 60 insertions, 48 deletions
diff --git a/.gitmodules b/.gitmodules index 4565f637..093f1fc4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,4 @@ # My Vim plugins -[submodule "vim/bundle/auto_cache_dirs"] - path = vim/bundle/auto_cache_dirs - url = https://sanctum.geek.nz/code/vim-auto-cache-dirs.git [submodule "vim/bundle/big_file_options"] path = vim/bundle/big_file_options url = https://sanctum.geek.nz/code/vim-big-file-options.git @@ -11,6 +8,9 @@ [submodule "vim/bundle/copy_linebreak"] path = vim/bundle/copy_linebreak url = https://sanctum.geek.nz/code/vim-copy-linebreak.git +[submodule "vim/bundle/digraph_search"] + path = vim/bundle/digraph_search + url = https://sanctum.geek.nz/code/vim-digraph-search.git [submodule "vim/bundle/insert_cancel"] path = vim/bundle/insert_cancel url = https://sanctum.geek.nz/code/vim-insert-cancel.git @@ -29,6 +29,9 @@ [submodule "vim/bundle/redact_pass"] path = vim/bundle/redact_pass url = https://sanctum.geek.nz/code/vim-redact-pass.git +[submodule "vim/bundle/shebang_create_exec"] + path = vim/bundle/shebang_create_exec + url = https://sanctum.geek.nz/code/vim-shebang-create-exec.git [submodule "vim/bundle/strip_trailing_whitespace"] path = vim/bundle/strip_trailing_whitespace url = https://sanctum.geek.nz/code/vim-strip-trailing-whitespace.git @@ -38,6 +41,9 @@ [submodule "vim/bundle/uncap_ex"] path = vim/bundle/uncap_ex url = https://sanctum.geek.nz/code/vim-uncap-ex.git +[submodule "vim/bundle/vimrc_reload_filetype"] + path = vim/bundle/vimrc_reload_filetype + url = https://sanctum.geek.nz/code/vim-vimrc-reload-filetype.git # My Vim filetype plugins [submodule "vim/bundle/diff_prune"] @@ -68,9 +74,3 @@ [submodule "vim/bundle/surround"] path = vim/bundle/surround url = https://sanctum.geek.nz/clone/vim-surround.git -[submodule "vim/bundle/digraph_search"] - path = vim/bundle/digraph_search - url = https://sanctum.geek.nz/code/vim-digraph-search.git -[submodule "vim/bundle/vimrc_reload_filetype"] - path = vim/bundle/vimrc_reload_filetype - url = https://sanctum.geek.nz/code/vim-vimrc-reload-filetype.git @@ -548,11 +548,17 @@ install-vim-bundle: install-vim-config 'cp -p -- "$$1" $(VIMDIR)/"$${1#vim/bundle/*/}"' _ {} \; $(VIM) -e -u NONE -c 'helptags $(VIMDIR)/doc' -c quit +install-vim-cache: + mkdir -p -- \ + $(VIMDIR)/cache/backup \ + $(VIMDIR)/cache/swap \ + $(VIMDIR)/cache/undo + install-vim-compiler: mkdir -p -- $(VIMDIR)/compiler cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler -install-vim-config: +install-vim-config: install-vim-cache cp -p -- vim/vimrc $(VIMRC) if [ -e /etc/debian_version ] ; then \ cp -p -- vim/system/debian.vim $(VIMDIR)/system.vim ; \ @@ -1,2 +1,2 @@ -tejr dotfiles v1.33.0 -Tue Jul 17 03:59:26 UTC 2018 +tejr dotfiles v1.34.0 +Tue Jul 17 22:14:46 UTC 2018 diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim index 88254ea6..475527b9 100644 --- a/vim/after/ftplugin/sh.vim +++ b/vim/after/ftplugin/sh.vim @@ -27,7 +27,8 @@ let b:undo_ftplugin .= '|unlet b:current_compiler b:sh_check_compiler' \ . '|setlocal errorformat< makeprg<' " Resort to g:is_posix for correct syntax on older runtime files -if b:is_posix && (v:version < 800 || v:version == 800 && !has('patch257')) +if exists('b:is_posix') + \ && (v:version < 800 || v:version == 800 && !has('patch257')) let g:is_posix = 1 endif diff --git a/vim/bundle/auto_cache_dirs b/vim/bundle/auto_cache_dirs deleted file mode 160000 -Subproject 70ce18086dcd84044b307d1481ae8651b9edd4a diff --git a/vim/bundle/shebang_create_exec b/vim/bundle/shebang_create_exec new file mode 160000 +Subproject 9adbf4f7e575fe8bbcfb2e1b2b6cd34bf42140a diff --git a/vim/plugin/shebang_create_exec.vim b/vim/plugin/shebang_create_exec.vim deleted file mode 100644 index 7fabd8f7..00000000 --- a/vim/plugin/shebang_create_exec.vim +++ /dev/null @@ -1,35 +0,0 @@ -" -" shebang_create_exec.vim: Make a file executable on first save if it starts with a -" shebang. -" -" Author: Tom Ryder <tom@sanctum.geek.nz> -" License: Same as Vim itself -" -if exists('g:loaded_shebang_create_exec') || &compatible - finish -endif -if !has('autocmd') || !has('unix') || !exists('*shellescape') - finish -endif -let g:loaded_shebang_create_exec = 1 - -" Set up hook for before writes to check the buffer for new shebangs -augroup shebang_create_exec - autocmd! - autocmd BufWritePre * call s:Check(expand('<afile>:p')) -augroup END - -" If the buffer starts with a shebang and the file being saved to doesn't -" exist yet, set up a hook to make it executable after the write is done -function! s:Check(filename) abort - if stridx(getline(1), '#!') == 0 && !filereadable(a:filename) - autocmd shebang_create_exec BufWritePost <buffer> - \ call s:Chmod(expand('<afile>:p')) - endif -endfunction - -" Make the file executable and clear away the hook that called us -function! s:Chmod(filename) abort - autocmd! shebang_create_exec BufWritePost <buffer> - call system('chmod +x '.shellescape(a:filename)) -endfunction @@ -50,6 +50,13 @@ set backspace+=eol " Line breaks set backspace+=indent " Spaces from 'autoindent' set backspace+=start " The start of current insertion +" Try to keep swapfiles in one system-appropriate dir +if has('unix') + set directory^=~/.vim/cache/undo +elseif has('win32') || has('win64') + set directory^=~/vimfiles/cache/undo +endif + " How to deal with lines wrapping beyond the last screen row if v:version > 704 || v:version == 704 && has('patch2109') set display=truncate " Show '@@@' on the last line, if supported @@ -105,6 +112,24 @@ set shortmess+=I " Give me a bit longer to complete mappings set timeoutlen=3000 +" Backup settings +if has('backup') + + " Do keep backups + set backup + + " Try to keep them all in one system-appropriate dir, with full path + if has('unix') + set backupdir^=~/.vim/cache/backup// + elseif has('win32') || has('win64') + set backupdir^=~/vimfiles/cache/backup// + endif + + " Don't back up stuff in /dev/shm or /var/tmp + set backupskip+=/dev/shm,/var/tmp + +endif + " Clear default 'comments' value, let the filetype handle it if has('comments') set comments= @@ -142,6 +167,21 @@ if has('mksession') set sessionoptions-=options endif +" Persistent undo settings +if has('persistent_undo') + + " Do keep undo files + set undofile + + " Try to keep them all in one system-appropriate dir + if has('unix') + set undodir^=~/.vim/cache/undo// + elseif has('win32') || has('win64') + set undodir^=~/vimfiles/cache/undo// + endif + +endif + " Let me move beyond buffer text in visual block mode if has('virtualedit') set virtualedit+=block |