X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=88eb6b4f546c7c9e0fbb80ef6300e0340264db31;hb=d6b57a3d60648fecb848a223e4cdcee6cfdb8eb5;hp=73f3f1df4fe3c14602eace34922790f2b4080cd9;hpb=2db0a467f04f780ad21c109ad6531dfacacc853c;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 73f3f1d..88eb6b4 100644 --- a/zsh/rc +++ b/zsh/rc @@ -66,30 +66,34 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\ %(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \ %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )" -# Allow substitutions and expansions in the prompt, necessary for vcs_info. -setopt promptsubst -# Load vcs_info to display information about version control repositories. -autoload -Uz vcs_info -# Only look for git and mercurial repositories; the only I use. -zstyle ':vcs_info:*' enable git hg -# Set style of vcs_info display. The current branch (green) and vcs (blue) is -# displayed. If there is an special action going on (merge, rebase) it's also -# displayed (red). -zstyle ':vcs_info:*' formats \ -"(%{${fg[green]}%}%b%{${fg[default]}%}:\ +# VCS_Info was added in 4.3.9. +if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then + # Allow substitutions and expansions in the prompt, necessary for + # vcs_info. + setopt promptsubst + # Load vcs_info to display information about version control repositories. + autoload -Uz vcs_info + # Only look for git and mercurial repositories; the only I use. + zstyle ':vcs_info:*' enable git hg + # Set style of vcs_info display. The current branch (green) and vcs (blue) + # is displayed. If there is an special action going on (merge, rebase) + # it's also displayed (red). + zstyle ':vcs_info:*' formats \ + "(%{${fg[green]}%}%b%{${fg[default]}%}:\ %{${fg[blue]}%}%s%{${fg[default]}%})" -zstyle ':vcs_info:*' actionformats \ -"(%{${fg[green]}%}%b%{${fg[default]}%}/\ + zstyle ':vcs_info:*' actionformats \ + "(%{${fg[green]}%}%b%{${fg[default]}%}/\ %{${fg[red]}%}%a%{${fg[default]}%}:\ %{${fg[blue]}%}%s%{${fg[default]}%})" -# Call vcs_info as precmd before every prompt. -prompt_precmd() { - vcs_info -} -add-zsh-hook precmd prompt_precmd + # Call vcs_info as precmd before every prompt. + prompt_precmd() { + vcs_info + } + add-zsh-hook precmd prompt_precmd -# Display the vcs information in the right prompt. -RPROMPT='${vcs_info_msg_0_}' + # Display the vcs information in the right prompt. + RPROMPT='${vcs_info_msg_0_}' +fi # When screen is used set the name of the window to the currently running # program. @@ -201,8 +205,10 @@ alias diff='diff -u' # Display all files and use human readable sizes. alias du='du -sh' -# Multiple files given to Vim are opened in tabs. -alias vim='vim -p' +# Multiple files given to Vim are opened in tabs, supported since Vim 7. +if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then + alias vim='vim -p' +fi # Shortcuts for often used programs. alias e='elinks'