Merge branch 'master' into hjp

This commit is contained in:
Peter J. Holzer 2020-11-12 15:19:00 +01:00 committed by Peter J. Holzer
commit d711b9ba76
2 changed files with 7 additions and 1 deletions

4
.vimrc
View File

@ -36,6 +36,7 @@ endif
map <F7> :cp map <F7> :cp
map <F8> :cn map <F8> :cn
map!  >I<yypa/O map!  >I<yypa/O
map! [27;5;101~ >I<yypa/O
autocmd FileType perl let perl_fold=1 autocmd FileType perl let perl_fold=1
autocmd FileType perl syntax on autocmd FileType perl syntax on
@ -49,3 +50,6 @@ autocmd FileType javascript set sw=2
autocmd FileType html set sw=2 autocmd FileType html set sw=2
autocmd FileType crontab set tw=0 autocmd FileType crontab set tw=0
autocmd BufRead,BufNewFile redmine*.txt set filetype=textile
autocmd FileType textile set tw=0 linebreak

View File

@ -97,7 +97,9 @@ then
`$preppath -c -e -r /usr/local/go-1.*/bin` `$preppath -c -e -r /usr/local/go-1.*/bin`
`$preppath -c -e -r $HOME/go/bin` `$preppath -c -e -r $HOME/go/bin`
PATH=`$preppath -c $HOME/scripts` PATH=`$preppath -c $HOME/scripts`
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin` PATH=`$preppath -c $HOME/bin`
PATH=`$preppath -c $HOME/bin/hosts`
PATH=`$preppath -c $HOME/bin/hosts/*(/)`
# then append less important stuff # then append less important stuff
PATH=`apppath -c /usr/local/www/offline/devel.fiw/bin` PATH=`apppath -c /usr/local/www/offline/devel.fiw/bin`