X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=b4498aa9ea6ffda640c4903f8b455e8ae0042c0c;hb=66ed096a1136c4b5d0dfe2e1128445c8afa5cc4f;hp=d627a083ae66ae51e72aa3361a91a448d7def2fb;hpb=b930f401947d809a0ef7ab9aed7aa808105fb682;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index d627a08..b4498aa 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -80,11 +80,11 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
     # it's also displayed (red).
     zstyle ':vcs_info:*' formats \
     "(%{${fg[green]}%}%b%{${fg[default]}%}:\
-    %{${fg[blue]}%}%s%{${fg[default]}%})"
+%{${fg[blue]}%}%s%{${fg[default]}%})"
     zstyle ':vcs_info:*' actionformats \
     "(%{${fg[green]}%}%b%{${fg[default]}%}/\
-    %{${fg[red]}%}%a%{${fg[default]}%}:\
-    %{${fg[blue]}%}%s%{${fg[default]}%})"
+%{${fg[red]}%}%a%{${fg[default]}%}:\
+%{${fg[blue]}%}%s%{${fg[default]}%})"
     # Call vcs_info as precmd before every prompt.
     prompt_precmd() {
         vcs_info
@@ -106,8 +106,14 @@ if [[ $TERM == screen ]]; then
     screen_name_reset=yes
 
     screen_preexec() {
-        # Get the application name excluding any arguments.
-        local program_name=${1%% *}
+        # Get the program name with its arguments.
+        local program_name=$1
+        # When sudo is used use real program name instead.
+        if [[ $program_name == sudo* ]]; then
+            program_name=${program_name#sudo }
+        fi
+        # Remove all arguments from the program name.
+        program_name=${program_name%% *}
 
         # Ignore often used commands which are only running for a very short
         # time. This prevents a "blinking" name when it's changed to "cd" for
@@ -205,8 +211,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'