diff options
-rw-r--r-- | .gitignore | 347 | ||||
-rw-r--r-- | dist/vim-plugin.sh | 18 | ||||
-rw-r--r-- | vim/ftdetect/perl.vim | 2 | ||||
-rw-r--r-- | vim/plugin/wildignore.vim | 15 | ||||
-rw-r--r-- | vim/system/centos.vim | 2 | ||||
-rw-r--r-- | vim/system/debian.vim | 4 | ||||
-rw-r--r-- | vim/vimrc | 10 |
7 files changed, 192 insertions, 206 deletions
@@ -1,174 +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 -vim/dist +/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.m4 +/bin/chn.sh +/bin/clog +/bin/clrd +/bin/clwr +/bin/csmw +/bin/d2u +/bin/dam +/bin/ddup +/bin/dfv +/bin/dfv.m4 +/bin/dfv.sh +/bin/dmp +/bin/dub +/bin/edda +/bin/edda.m4 +/bin/edda.sh +/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.m4 +/bin/mim.sh +/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.m4 +/bin/oii.sh +/bin/onl +/bin/osc +/bin/p +/bin/pa +/bin/paz +/bin/ped +/bin/pit +/bin/plmu +/bin/pp +/bin/pph +/bin/pst +/bin/pst.m4 +/bin/pst.sh +/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.m4 +/bin/swr.sh +/bin/td +/bin/tl +/bin/tlcs +/bin/tlcs.m4 +/bin/tlcs.sh +/bin/tm +/bin/tot +/bin/trs +/bin/try +/bin/try.m4 +/bin/try.sh +/bin/u2d +/bin/umake +/bin/unf +/bin/urlc +/bin/urlc.m4 +/bin/urlc.sh +/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 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 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/* 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, ',') 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& 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 @@ -53,15 +53,17 @@ 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 -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') |