From a26820130c1a71e217bec8731285463287f92665 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 15 Aug 2018 10:52:00 +1200 Subject: Simplify g:is_posix unset, add g:is_kornshell --- vim/after/syntax/sh.vim | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index 977ee2cb..95b4517d 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -6,10 +6,7 @@ endif " Remove g:is_posix if we resorted to it in order to get correct POSIX sh " highlighting with older Vim runtime files -if exists('g:is_posix') - \ && (v:version < 800 || v:version == 800 && !has('patch257')) - unlet g:is_posix -endif +unlet! g:is_posix g:is_kornshell " If we know we have another shell type, clear away the others completely, now " that core syntax/sh.vim is done prodding /bin/sh to determine the system -- cgit v1.2.3 From b50f53cd8c1f9f702bd0e7e3011cbfce20a79bc6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 15 Aug 2018 12:34:36 +1200 Subject: Allow loading gzip plugin Vim's help files are sometimes compressed, assuming this is available, so I'll put up with this. --- vim/plugin/dist.vim | 1 - 1 file changed, 1 deletion(-) diff --git a/vim/plugin/dist.vim b/vim/plugin/dist.vim index ac3671a2..37fc9042 100644 --- a/vim/plugin/dist.vim +++ b/vim/plugin/dist.vim @@ -3,7 +3,6 @@ let g:loaded_getscriptPlugin = 1 let g:loaded_vimballPlugin = 1 " Vim is the wrong tool for reading archives or compressed text -let g:loaded_gzip = 1 let g:loaded_tarPlugin = 1 let g:loaded_zipPlugin = 1 " I prefer filtering text with Unix tools -- cgit v1.2.3 From 25b513d7c932bc052d91863a8743f1a3124097d2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 16 Aug 2018 10:13:33 +1200 Subject: Bind Alt-' in readline to insert '\'' for shell --- readline/inputrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readline/inputrc b/readline/inputrc index 7e4b500d..c11d8fe7 100644 --- a/readline/inputrc +++ b/readline/inputrc @@ -77,6 +77,9 @@ $if Bash # Alt-M (for muxer) to run tm(1df) "\em": "\C-utm\C-j\C-y" + # Alt-' for escaped single-quote: 'don'\''t fear the reaper' + "\e'": "'\\''" + # Ctrl-Alt-B to move backward a shell-quoted word "\e\C-b": shell-backward-word # Ctrl-Alt-F to move forward a shell-quoted word -- cgit v1.2.3 From 575f00d21486e0226064c4e1a18d522555257525 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 16 Aug 2018 10:49:19 +1200 Subject: Use slightly more correct dir definitions --- vim/vimrc | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 2531327d..86ce7158 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -46,7 +46,11 @@ set backspace+=start " The start of current insertion " Try to keep backups in one system-appropriate dir set backup -set backupdir^=~/.vim/cache/backup,~/vimfiles/cache/backup +set backupdir^=~/.vim/cache/backup +if has('win32') || has('win64') + set backupdir-=~/.vim/cache/backup + set backupdir^=~/vimfiles/cache/backup +endif " Add some paths not to back up set backupskip^=/dev/shm/* @@ -69,7 +73,11 @@ if exists('+cursorline') endif " Try to keep swapfiles in one system-appropriate dir -set directory^=~/.vim/cache/swap//,~/vimfiles/cache/swap// +set directory^=~/.vim/cache/swap// +if has('win32') || has('win64') + set directory-=~/.vim/cache/swap// + set directory^=~/vimfiles/cache/swap// +endif " Use UTF-8 if we can and env LANG didn't tell us not to if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1' @@ -172,7 +180,11 @@ endif " Keep undo files, hopefully in a dedicated directory if has('persistent_undo') set undofile - set undodir^=~/.vim/cache/undo//,~/vimfiles/cache/undo// + set undodir^=~/.vim/cache/undo// + if has('win32') || has('win64') + set undodir-=~/.vim/cache/undo// + set undodir^=~/vimfiles/cache/undo// + endif endif " Don't store any options or mappings in sessions -- cgit v1.2.3 From d46aac50323da8bec2e1f906bd37098a466a3fa5 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 16 Aug 2018 10:49:35 +1200 Subject: Add per-flag comments for 'bsk', 'ssop' --- vim/vimrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 86ce7158..68f18c8a 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -53,8 +53,8 @@ if has('win32') || has('win64') endif " Add some paths not to back up -set backupskip^=/dev/shm/* -set backupskip^=/var/tmp/* +set backupskip^=/dev/shm/* " Shared memory RAM disk +set backupskip^=/var/tmp/* " Debian's $TMPDIR for sudoedit(8) " Indent wrapped lines silent! set breakindent @@ -187,10 +187,10 @@ if has('persistent_undo') endif endif -" Don't store any options or mappings in sessions +" Make sessions usable if exists('+sessionoptions') - set sessionoptions-=localoptions - set sessionoptions-=options + set sessionoptions-=localoptions " No buffer options or mappings + set sessionoptions-=options " No global options or mappings endif " Let me move beyond buffer text in visual block mode -- cgit v1.2.3 From b3da7c05b57542f48f39c6fd24307f1781754c4f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 16 Aug 2018 12:37:53 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 20e8ebde..403cb1ad 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.53.0 -Tue Aug 14 22:12:38 UTC 2018 +tejr dotfiles v1.54.0 +Thu Aug 16 00:37:53 UTC 2018 -- cgit v1.2.3