From 12653d4a5cb6f6e80d8d3d35ab5427eb827635c0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 10:32:03 +1200 Subject: Make 'backupskip' with Unix paths depend on +unix --- vim/vimrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index 36090c8c..d823568c 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -61,7 +61,9 @@ elseif has('win32') || has('win64') endif " Don't back up stuff in /dev/shm or /var/tmp -set backupskip+=/dev/shm,/var/tmp +if has('unix') + set backupskip+=/dev/shm,/var/tmp +endif " Try to keep swapfiles in one system-appropriate dir if has('unix') -- cgit v1.2.3 From 5bdb2da73bfa63dd2af4b69c999374f1833dbc77 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 10:36:03 +1200 Subject: Remove double-trail-slash from 'backupdir' I forgot that it only works for 'directory' and 'undodir'. --- vim/vimrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index d823568c..d93537df 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -53,11 +53,11 @@ set backspace+=start " The start of current insertion " Do keep backups set backup -" Try to keep them all in one system-appropriate dir, with full path +" Try to keep them all in one system-appropriate dir if has('unix') - set backupdir^=~/.vim/cache/backup// + set backupdir^=~/.vim/cache/backup elseif has('win32') || has('win64') - set backupdir^=~/vimfiles/cache/backup// + set backupdir^=~/vimfiles/cache/backup endif " Don't back up stuff in /dev/shm or /var/tmp -- cgit v1.2.3 From c623461719fabdc39bba69d205aca2e2bec4b531 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 10:51:51 +1200 Subject: Only add uppercase 'wildignore' if it matters --- vim/plugin/wildignore.vim | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/vim/plugin/wildignore.vim b/vim/plugin/wildignore.vim index b87b62b1..b10eaa01 100644 --- a/vim/plugin/wildignore.vim +++ b/vim/plugin/wildignore.vim @@ -154,12 +154,15 @@ function! s:Wildignore() abort \,'*.swp' \ ] - " For any that had lowercase letters, add their uppercase analogues - for l:ignore in l:ignores - if l:ignore =~# '\l' - call add(l:ignores, toupper(l:ignore)) - endif - endfor + " If on a system where case matters for filenames, for any that had + " lowercase letters, add their uppercase analogues + if has('fname_case') + for l:ignore in l:ignores + if l:ignore =~# '\l' + call add(l:ignores, toupper(l:ignore)) + endif + endfor + endif " Return the completed setting return join(l:ignores, ',') -- cgit v1.2.3 From ccf79befb3d78d1e1047c6cd16d1584506bcd400 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 11:18:07 +1200 Subject: Remove silent! prefix from Debian 'rtp' revert Not actually needed. --- vim/system/debian.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/system/debian.vim b/vim/system/debian.vim index 125a9240..1db56f74 100644 --- a/vim/system/debian.vim +++ b/vim/system/debian.vim @@ -17,5 +17,5 @@ endif set t_Co& t_Sf& t_Sb& " Remove addons directories from 'runtimepath' if present -silent! set runtimepath-=/var/lib/vim/addons -silent! set runtimepath-=/var/lib/vim/addons/after +set runtimepath-=/var/lib/vim/addons +set runtimepath-=/var/lib/vim/addons/after -- cgit v1.2.3 From e51fc7d5c759d5948b0050bedc4278dbe12ce2c5 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 11:19:32 +1200 Subject: Clarify perl.vim ftdetect comment a bit --- vim/ftdetect/perl.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/ftdetect/perl.vim b/vim/ftdetect/perl.vim index 21a782c6..95830b0b 100644 --- a/vim/ftdetect/perl.vim +++ b/vim/ftdetect/perl.vim @@ -1,5 +1,5 @@ " If it's a new file in a bin, libexec, or scripts subdir that has a -" Makefile.PL, it's almost definitely Perl. +" Makefile.PL sibling, and I'm editing it, it's almost definitely Perl. autocmd filetypedetect BufNewFile \ */bin/* \,*/libexec/* -- cgit v1.2.3 From 5a4e2c1748b21ec6abfdf9015ce62b91b25dd590 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 11:37:38 +1200 Subject: Use full command name in CentOS system Vim revert --- vim/system/centos.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/system/centos.vim b/vim/system/centos.vim index 0c5854d4..d5ea1036 100644 --- a/vim/system/centos.vim +++ b/vim/system/centos.vim @@ -13,7 +13,7 @@ if has('cscope') set cscopetag& set cscopetagorder& set cscopeverbose& - silent! cs kill + silent! cscope kill endif if has('gui') set guicursor& -- cgit v1.2.3 From 59665d0bf65161e00da0ffc4f1c3db408008d750 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 13:48:05 +1200 Subject: Remove vim/dist from .gitignore No longer needed. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 98ac8372..962f9b3a 100644 --- a/.gitignore +++ b/.gitignore @@ -171,4 +171,3 @@ gnupg/gpg.conf gnupg/gpg.conf.m4 include/mktd.m4 urxvt/ext/select -vim/dist -- cgit v1.2.3 From 521fd381383498a66151397820ffd2775d01cb0c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 13:48:30 +1200 Subject: Remove dist/vim-plugin.sh No longer needed. --- dist/vim-plugin.sh | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 dist/vim-plugin.sh diff --git a/dist/vim-plugin.sh b/dist/vim-plugin.sh deleted file mode 100644 index 0f549be4..00000000 --- a/dist/vim-plugin.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -ver=$(awk -Fv 'NR<2&&$0=$NF' VERSION) || exit -mkdir -p -- vim/dist || exit -cd -- vim/dist || exit -for pn ; do - dn=vim-$(printf '%s' "$pn"|sed 's/_/-/g')-$ver - mkdir -p -- "$pn" - for fn in ../*/"$pn".txt ../*/"$pn".vim ; do - [ -e "$fn" ] || continue - sdn=$fn - sdn=${sdn#../} - sdn=${sdn%/*} - mkdir -p -- "$pn"/"$sdn" - cp -- "$fn" "$pn"/"$sdn" - done - tar c "$pn" | gzip > "$dn".tar.gz || exit - rm -r -- "$pn" -done -- cgit v1.2.3 From 3d71e62f1fbe172548e583b1fac1e26b522b3138 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 13:49:41 +1200 Subject: Anchor paths in .gitignore --- .gitignore | 346 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 173 insertions(+), 173 deletions(-) diff --git a/.gitignore b/.gitignore index 962f9b3a..d7b9b5ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,173 +1,173 @@ -bin/ap -bin/apf -bin/ax -bin/bcq -bin/bel -bin/bl -bin/bp -bin/br -bin/brnl -bin/ca -bin/cf -bin/cfr -bin/chc -bin/chn -bin/chn.sh -bin/chn.m4 -bin/clog -bin/clrd -bin/clwr -bin/csmw -bin/d2u -bin/dam -bin/ddup -bin/dfv -bin/dfv.sh -bin/dfv.m4 -bin/dmp -bin/dub -bin/edda -bin/edda.sh -bin/edda.m4 -bin/eds -bin/exm -bin/fgscr -bin/finc -bin/fnl -bin/fnp -bin/gms -bin/grc -bin/grec -bin/gred -bin/gscr -bin/gwp -bin/han -bin/hms -bin/htdec -bin/htenc -bin/htref -bin/hurl -bin/igex -bin/isgr -bin/ix -bin/jfc -bin/jfcd -bin/jfp -bin/loc -bin/max -bin/maybe -bin/mean -bin/med -bin/mex -bin/mftl -bin/mi5 -bin/mim -bin/mim.sh -bin/mim.m4 -bin/min -bin/mkcp -bin/mked -bin/mkmv -bin/mktd -bin/mkvi -bin/mode -bin/motd -bin/murl -bin/mw -bin/nlbr -bin/oii -bin/oii.sh -bin/oii.m4 -bin/onl -bin/osc -bin/p -bin/pa -bin/paz -bin/ped -bin/pit -bin/plmu -bin/pp -bin/pph -bin/pst -bin/pst.sh -bin/pst.m4 -bin/pvi -bin/pwg -bin/quo -bin/rep -bin/rfcf -bin/rfcr -bin/rfct -bin/rgl -bin/rnda -bin/rndf -bin/rndi -bin/rndl -bin/rnds -bin/sd2u -bin/sec -bin/shb -bin/slow -bin/sls -bin/slsf -bin/sqs -bin/sra -bin/sshi -bin/sta -bin/stbl -bin/stex -bin/stws -bin/su2d -bin/sue -bin/supp -bin/swr -bin/swr.sh -bin/swr.m4 -bin/td -bin/tl -bin/tlcs -bin/tlcs.sh -bin/tlcs.m4 -bin/tm -bin/tot -bin/trs -bin/try -bin/try.sh -bin/try.m4 -bin/u2d -bin/umake -bin/unf -bin/urlc -bin/urlc.sh -bin/urlc.m4 -bin/urlh -bin/urlmt -bin/uts -bin/vest -bin/vex -bin/wro -bin/xgo -bin/xgoc -bin/xrbg -bin/xrq -games/aaf -games/acq -games/aesth -games/chkl -games/dr -games/drakon -games/kvlt -games/philsay -games/pks -games/rndn -games/rot13 -games/squ -games/strik -games/xyzzy -games/zs -git/gitconfig -git/gitconfig.m4 -gnupg/gpg.conf -gnupg/gpg.conf.m4 -include/mktd.m4 -urxvt/ext/select +/bin/ap +/bin/apf +/bin/ax +/bin/bcq +/bin/bel +/bin/bl +/bin/bp +/bin/br +/bin/brnl +/bin/ca +/bin/cf +/bin/cfr +/bin/chc +/bin/chn +/bin/chn.sh +/bin/chn.m4 +/bin/clog +/bin/clrd +/bin/clwr +/bin/csmw +/bin/d2u +/bin/dam +/bin/ddup +/bin/dfv +/bin/dfv.sh +/bin/dfv.m4 +/bin/dmp +/bin/dub +/bin/edda +/bin/edda.sh +/bin/edda.m4 +/bin/eds +/bin/exm +/bin/fgscr +/bin/finc +/bin/fnl +/bin/fnp +/bin/gms +/bin/grc +/bin/grec +/bin/gred +/bin/gscr +/bin/gwp +/bin/han +/bin/hms +/bin/htdec +/bin/htenc +/bin/htref +/bin/hurl +/bin/igex +/bin/isgr +/bin/ix +/bin/jfc +/bin/jfcd +/bin/jfp +/bin/loc +/bin/max +/bin/maybe +/bin/mean +/bin/med +/bin/mex +/bin/mftl +/bin/mi5 +/bin/mim +/bin/mim.sh +/bin/mim.m4 +/bin/min +/bin/mkcp +/bin/mked +/bin/mkmv +/bin/mktd +/bin/mkvi +/bin/mode +/bin/motd +/bin/murl +/bin/mw +/bin/nlbr +/bin/oii +/bin/oii.sh +/bin/oii.m4 +/bin/onl +/bin/osc +/bin/p +/bin/pa +/bin/paz +/bin/ped +/bin/pit +/bin/plmu +/bin/pp +/bin/pph +/bin/pst +/bin/pst.sh +/bin/pst.m4 +/bin/pvi +/bin/pwg +/bin/quo +/bin/rep +/bin/rfcf +/bin/rfcr +/bin/rfct +/bin/rgl +/bin/rnda +/bin/rndf +/bin/rndi +/bin/rndl +/bin/rnds +/bin/sd2u +/bin/sec +/bin/shb +/bin/slow +/bin/sls +/bin/slsf +/bin/sqs +/bin/sra +/bin/sshi +/bin/sta +/bin/stbl +/bin/stex +/bin/stws +/bin/su2d +/bin/sue +/bin/supp +/bin/swr +/bin/swr.sh +/bin/swr.m4 +/bin/td +/bin/tl +/bin/tlcs +/bin/tlcs.sh +/bin/tlcs.m4 +/bin/tm +/bin/tot +/bin/trs +/bin/try +/bin/try.sh +/bin/try.m4 +/bin/u2d +/bin/umake +/bin/unf +/bin/urlc +/bin/urlc.sh +/bin/urlc.m4 +/bin/urlh +/bin/urlmt +/bin/uts +/bin/vest +/bin/vex +/bin/wro +/bin/xgo +/bin/xgoc +/bin/xrbg +/bin/xrq +/games/aaf +/games/acq +/games/aesth +/games/chkl +/games/dr +/games/drakon +/games/kvlt +/games/philsay +/games/pks +/games/rndn +/games/rot13 +/games/squ +/games/strik +/games/xyzzy +/games/zs +/git/gitconfig +/git/gitconfig.m4 +/gnupg/gpg.conf +/gnupg/gpg.conf.m4 +/include/mktd.m4 +/urxvt/ext/select -- cgit v1.2.3 From 741ce7074c84d616b745e7e1d6fd776ede2fb1c0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 13:50:00 +1200 Subject: Sort .gitignore --- .gitignore | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index d7b9b5ce..e3328179 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,8 @@ /bin/cfr /bin/chc /bin/chn -/bin/chn.sh /bin/chn.m4 +/bin/chn.sh /bin/clog /bin/clrd /bin/clwr @@ -22,13 +22,13 @@ /bin/dam /bin/ddup /bin/dfv -/bin/dfv.sh /bin/dfv.m4 +/bin/dfv.sh /bin/dmp /bin/dub /bin/edda -/bin/edda.sh /bin/edda.m4 +/bin/edda.sh /bin/eds /bin/exm /bin/fgscr @@ -62,8 +62,8 @@ /bin/mftl /bin/mi5 /bin/mim -/bin/mim.sh /bin/mim.m4 +/bin/mim.sh /bin/min /bin/mkcp /bin/mked @@ -76,8 +76,8 @@ /bin/mw /bin/nlbr /bin/oii -/bin/oii.sh /bin/oii.m4 +/bin/oii.sh /bin/onl /bin/osc /bin/p @@ -89,8 +89,8 @@ /bin/pp /bin/pph /bin/pst -/bin/pst.sh /bin/pst.m4 +/bin/pst.sh /bin/pvi /bin/pwg /bin/quo @@ -121,25 +121,25 @@ /bin/sue /bin/supp /bin/swr -/bin/swr.sh /bin/swr.m4 +/bin/swr.sh /bin/td /bin/tl /bin/tlcs -/bin/tlcs.sh /bin/tlcs.m4 +/bin/tlcs.sh /bin/tm /bin/tot /bin/trs /bin/try -/bin/try.sh /bin/try.m4 +/bin/try.sh /bin/u2d /bin/umake /bin/unf /bin/urlc -/bin/urlc.sh /bin/urlc.m4 +/bin/urlc.sh /bin/urlh /bin/urlmt /bin/uts -- cgit v1.2.3 From cde8d297bf1efd705353e33179f78cbf94d4054b Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 18:00:17 +1200 Subject: Amend a vimrc comment --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index acaaaa61..b98315bf 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -53,7 +53,7 @@ set backspace+=start " The start of current insertion " Do keep backups set backup -" Try to keep them all in one system-appropriate dir +" Try to keep backups in one system-appropriate dir if has('unix') set backupdir^=~/.vim/cache/backup elseif has('win32') || has('win64') -- cgit v1.2.3 From 14a348482af2e4060344c4f4bf5615c8c6bedfe0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 18:00:26 +1200 Subject: Add to 'backupskip' one element at a time --- vim/vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index b98315bf..9ee5c264 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -62,7 +62,8 @@ endif " Don't back up stuff in /dev/shm or /var/tmp if has('unix') - set backupskip+=/dev/shm/*,/var/tmp/* + set backupskip+=/dev/shm/* + set backupskip+=/var/tmp/* endif " Try to keep swapfiles in one system-appropriate dir -- cgit v1.2.3 From 3b8e9c4847c8d919866aa9e364b6d9ee7e9033ec Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 18:07:47 +1200 Subject: Interfere more specifically with 'path' --- vim/vimrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 9ee5c264..93e84dc8 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -140,9 +140,10 @@ if has('extra_search') set incsearch " Show matches as I type endif -" More sensible language-agnostic setting for gf/:find +" Options for file search with gf/:find if has('file_in_path') - set path=.,,** + set path-=/usr/include " Let the C/C++ filetypes set that + set path+=** " Search current directory's whole tree endif " Don't load GUI menus; set here before GUI starts -- cgit v1.2.3 From 8535014902728c8856997e207f9c9fda6030a097 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 21:31:22 +1200 Subject: Set UTF-8 default 'encoding' --- vim/vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index 93e84dc8..ec997e02 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -80,6 +80,11 @@ else set display=lastline " Just let it run off the screen if not endif +" If $LANG isn't set and 'encoding' is the default, use UTF-8 +if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1' + set encoding=utf-8 +endif + " Don't wait for a key after Escape in insert mode if exists('+esckeys') " Not in Neovim set noesckeys -- cgit v1.2.3 From c840bdc71db0fb89cf5f20e353d3356c205e5b03 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 22:20:42 +1200 Subject: Make /usr/include 'path' setting hinge on +unix --- vim/after/ftplugin/c.vim | 9 +++++++-- vim/after/ftplugin/cpp.vim | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/vim/after/ftplugin/c.vim b/vim/after/ftplugin/c.vim index e101b20c..fff9de04 100644 --- a/vim/after/ftplugin/c.vim +++ b/vim/after/ftplugin/c.vim @@ -5,5 +5,10 @@ endif " Set comment formats setlocal include=^\\s*#\\s*include -setlocal path+=/usr/include -let b:undo_ftplugin .= '|setlocal include< path<' +let b:undo_ftplugin .= '|setlocal include<' + +" Include headers on UNIX +if has('unix') + setlocal path+=/usr/include + let b:undo_ftplugin .= '|setlocal path<' +endif diff --git a/vim/after/ftplugin/cpp.vim b/vim/after/ftplugin/cpp.vim index a826bf43..38c94330 100644 --- a/vim/after/ftplugin/cpp.vim +++ b/vim/after/ftplugin/cpp.vim @@ -5,5 +5,10 @@ endif " Set comment formats setlocal include=^\\s*#\\s*include -setlocal path+=/usr/include -let b:undo_ftplugin .= '|setlocal include< path<' +let b:undo_ftplugin .= '|setlocal include<' + +" Include headers on UNIX +if has('unix') + setlocal path+=/usr/include + let b:undo_ftplugin .= '|setlocal path<' +endif -- cgit v1.2.3 From 777130035bb9cbd22d3c1502e91a751894c2c434 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 Jul 2018 22:39:42 +1200 Subject: Remove line continuations from VimL indent after --- vim/after/indent/vim.vim | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim index 73b4e430..ed1b8ebb 100644 --- a/vim/after/indent/vim.vim +++ b/vim/after/indent/vim.vim @@ -8,7 +8,6 @@ endif " Commands to undo the above if exists('b:undo_indent') - let b:undo_indent = b:undo_indent - \ . '|setlocal shiftwidth<' - \ . '|setlocal softtabstop<' + let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<' + let b:undo_indent = b:undo_indent . '|setlocal softtabstop<' endif -- cgit v1.2.3 From 45f31a03c727a8b29dfe65ac27ecfbbdf8f58d15 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 19 Jul 2018 09:15:08 +1200 Subject: Add compatible/version guard to syntax after files --- vim/after/syntax/gitcommit.vim | 6 ++++++ vim/after/syntax/messages.vim | 6 ++++++ vim/after/syntax/sh.vim | 14 ++++---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/vim/after/syntax/gitcommit.vim b/vim/after/syntax/gitcommit.vim index e47091f9..2232e499 100644 --- a/vim/after/syntax/gitcommit.vim +++ b/vim/after/syntax/gitcommit.vim @@ -1,2 +1,8 @@ +" Don't try to make these corrections if running 'compatible' or if the +" runtime files are too old +if &compatible || v:version < 700 + finish +endif + " If my commit subject is too long, highlight it as an error. highlight link gitCommitOverflow Error diff --git a/vim/after/syntax/messages.vim b/vim/after/syntax/messages.vim index 04faa607..75fe89b9 100644 --- a/vim/after/syntax/messages.vim +++ b/vim/after/syntax/messages.vim @@ -1,3 +1,9 @@ +" Don't try to make these corrections if running 'compatible' or if the +" runtime files are too old +if &compatible || v:version < 700 + finish +endif + " The highlighting for errors in syslog/messages files is more often annoying " than useful, so just turn it off. syntax clear messagesError diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index 026e4ebd..00f95fc0 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -1,7 +1,7 @@ -" Support line continuation for this file -if &compatible - let s:cpoptions_save = &cpoptions - set cpoptions-=C +" Don't try to make these corrections if running 'compatible' or if the +" runtime files are too old +if &compatible || v:version < 700 + finish endif " If we know we have another shell type, clear away the others completely, now @@ -216,9 +216,3 @@ if exists('b:is_bash') \ variables \ wait endif - -" Restore 'cpoptions' setting if we touched it -if exists('s:cpoptions_save') - let &cpoptions = s:cpoptions_save - unlet s:cpoptions_save -endif -- cgit v1.2.3 From 204eb1fab492cc32b7f60dae6684fd14db1003e4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 19 Jul 2018 10:47:59 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 12cbac54..a5e11840 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.34.3 -Wed Jul 18 01:55:36 UTC 2018 +tejr dotfiles v1.35.0 +Wed Jul 18 22:47:49 UTC 2018 -- cgit v1.2.3