Merge pull request 'dev' (#14) from dev into master

Reviewed-on: #14
master
Totem4 Totem4 3 years ago
commit ab83f35c7a

@ -11,8 +11,8 @@ alias la='ls -A'
alias l='ls -CF' alias l='ls -CF'
alias sl='ls' alias sl='ls'
[ -x $JSSHHOME/sshrc.jssh ] && alias jssh="$JSSHHOME/sshrc.jssh" [ -x $JSSHHOME/sshrc.jssh ] && alias jssh="$JSSHHOME/sshrc.jssh"
[ -r $JSSHHOME/screenrc.jssh ] && alias screen="screen -c $JSSHHOME/screenrc.jssh" which screen >/dev/null 2>&1 && [ -r $JSSHHOME/screenrc.jssh ] && alias screen="screen -c $JSSHHOME/screenrc.jssh"
[ -r $JSSHHOME/vimrc.jssh ] && export VIMINIT="let \$MYVIMRC='$JSSHHOME/vimrc.jssh' | source \$MYVIMRC" which vim >/dev/null 2>&1 && [ -r $JSSHHOME/vimrc.jssh ] && export VIMINIT="let \$MYVIMRC='$JSSHHOME/vimrc.jssh' | source \$MYVIMRC"
PROMPT_COMMAND=__prompt_command PROMPT_COMMAND=__prompt_command
__prompt_command() { __prompt_command() {
local curr_exit="$?" local curr_exit="$?"

@ -29,3 +29,4 @@ let &backupdir=localdir . "//"
set mouse="" set mouse=""
set shiftwidth=4 set shiftwidth=4
set tabstop=4 set tabstop=4
autocmd FileType yaml setlocal ai ts=2 sw=2 et

Loading…
Cancel
Save