X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=b8ad05fab87c1686360f2581f49e6662322ed367;hb=0acec18969e0c3540b09a49802c8f75b3d9b96f4;hp=73f3f1df4fe3c14602eace34922790f2b4080cd9;hpb=2db0a467f04f780ad21c109ad6531dfacacc853c;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 73f3f1d..b8ad05f 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -34,8 +34,8 @@ setopt ignoreeof
 # HISTORY SETTINGS
 
 # Use history and store it in ~/.zsh/history.
-HISTSIZE=1000
-SAVEHIST=1000
+HISTSIZE=5000
+SAVEHIST=5000
 HISTFILE=~/.zsh/history
 # Append to the history file instead of overwriting it and do it immediately
 # when a command is executed.
@@ -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.
@@ -102,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
@@ -201,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'
@@ -249,6 +261,13 @@ function ll() {
     la -l $*
 }
 
+# Set correct fpath to allow loading my functions (including completion
+# functions).
+fpath=(~/.zsh/functions $fpath)
+# Autoload my functions (except completion functions). Thanks to caphuso from
+# the Zsh example files for this idea.
+autoload ${fpath[1]}/^_*(:t)
+
 # If ^C is pressed while typing a command, add it to the history so it can be
 # easily retrieved later and then abort like ^C normally does. This is useful
 # when I want to abort an command to do something in between and then finish