Merge branch 'master' into wsr_shared
This commit is contained in:
commit
ba609f7683
4
.vimrc
4
.vimrc
|
@ -35,6 +35,7 @@ endif
|
|||
map <F7> :cp
|
||||
map <F8> :cn
|
||||
map! >I<yypa/O
|
||||
map! [27;5;101~ >I<yypa/O
|
||||
autocmd FileType perl let perl_fold=1
|
||||
autocmd FileType perl syntax on
|
||||
|
||||
|
@ -48,3 +49,6 @@ autocmd FileType javascript set sw=2
|
|||
autocmd FileType html set sw=2
|
||||
|
||||
autocmd FileType crontab set tw=0
|
||||
|
||||
autocmd BufRead,BufNewFile redmine*.txt set filetype=textile
|
||||
autocmd FileType textile set tw=0 linebreak
|
||||
|
|
4
.zshenv
4
.zshenv
|
@ -98,7 +98,9 @@ then
|
|||
`$preppath -c -e -r /usr/local/go-1.*/bin`
|
||||
`$preppath -c -e -r $HOME/go/bin`
|
||||
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
|
||||
PATH=`apppath -c /usr/local/www/offline/devel.fiw/bin`
|
||||
|
|
Loading…
Reference in New Issue