X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=ad641b9b3fbab962e721846d8d240b125e59af7d;hb=1434bb718d186e575f79cb9a9b04ebf4ca29aef2;hp=bf314adff3b67b70035695fdb68befe44fbf9bd9;hpb=6a1732133999aec6493c5c0225ac2e1ddf5fdfbc;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index bf314ad..ad641b9 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -82,13 +82,7 @@ fi
 
 # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At
 # the moment only precmd(), preexec() and chpwd() are simulated.
-#
-# At least 4.3.4 (not sure about later versions) has an error in add-zsh-hook
-# so the compatibility version is used there too.
-if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then
-    # Provide add-zsh-hook which was added in 4.3.4.
-    fpath=(~/.zsh/functions/compatibility $fpath)
-
+if [[ $ZSH_VERSION != (4.3.<4->*|4.<4->*|<5->*) ]]; then
     # Run all functions defined in the ${precmd,preexec,chpwd}_functions
     # arrays.
     function precmd() {
@@ -108,9 +102,6 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then
     }
 fi
 
-# Autoload add-zsh-hook to add/remove zsh hook functions easily.
-autoload -Uz add-zsh-hook
-
 # Load zmv (zsh move) which is a powerful file renamer.
 autoload -Uz zmv
 
@@ -186,7 +177,7 @@ local default="%{${fg[default]}%}"
 # vcs_info was added in 4.3.9 but it works in earlier versions too. So load it
 # if the necessary files are available in ~/.zsh/functions/vcs_info (often a
 # symbolic link to current checkout of Zsh's sources).
-if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
+if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
       -d ~/.zsh/functions/vcs_info ]]; then
     # Update fpath to allow loading the vcs_info functions.
     if [[ -d ~/.zsh/functions/vcs_info ]]; then
@@ -207,7 +198,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     # is displayed. If there is an special action going on (merge, rebase)
     # it's also displayed (red). Also display if there are unstaged or staged
     # (%u/%c) changes.
-    if [[ $ZSH_VERSION == (4.3.<11->|4.<4->*|<5->*) ||
+    if [[ $ZSH_VERSION == (4.3.<11->*|4.<4->*|<5->*) ||
           -d ~/.zsh/functions/vcs_info ]]; then
         zstyle ':vcs_info:*' formats \
             "($green%b%u%c$default:$blue%s$default)"
@@ -266,7 +257,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     prompt_chpwd() {
         FORCE_RUN_VCS_INFO=1
     }
-    add-zsh-hook chpwd prompt_chpwd
+    chpwd_functions+=(prompt_chpwd)
 
     # Used by prompt code below to determine if vcs_info should be run.
     RUN_VCS_INFO=1
@@ -325,7 +316,7 @@ $blue%B'%b$default\
 $green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \
 %(?..($red%B%?%b$default%) )"
 }
-add-zsh-hook precmd prompt_precmd
+precmd_functions+=(prompt_precmd)
 
 
 # When screen, tmux, xterm or rxvt is used set the name of the window to the
@@ -468,8 +459,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
     fi
 
     # Add the preexec() and precmd() hooks.
-    add-zsh-hook preexec window_preexec
-    add-zsh-hook precmd window_precmd
+    preexec_functions+=(window_preexec)
+    precmd_functions+=(window_precmd)
 else
     # Fallback if another TERM is used, necessary to run screen (see below in
     # "RUN COMMANDS").
@@ -610,6 +601,12 @@ bindkey '^F' complete-files
 # <nyh@math.technion.ac.il> for a fix (-r) to handle whitespace/quotes
 # correctly, both on the Zsh mailing list.
 TRAPINT() {
+    # Don't store this line in history if histignorespace is enabled and the
+    # line starts with a space.
+    if [[ -o histignorespace && ${BUFFER[1]} = " " ]]; then
+        return $1
+    fi
+
     # Store the current buffer in the history.
     zle && print -s -r -- $BUFFER
 
@@ -625,10 +622,14 @@ fi
 # Make sure aliases are expanded when using sudo.
 alias sudo='sudo '
 
-# Global aliases for often used commands in the command line.
+# Global aliases for often used redirections.
 alias -g E='2>&1'
+alias -g N='>/dev/null'
+alias -g EN='2>/dev/null'
 alias -g L='2>&1 | less'
+alias -g LS='2>&1 | less -S' # -S prevents wrapping of long lines
 alias -g D='2>&1 | colordiff | less'
+# Global aliases for often used commands in the command line.
 alias -g A='| awk'
 alias -g G='| grep'
 alias -g H='| head'
@@ -711,8 +712,9 @@ fi
 
 # LOAD ADDITIONAL CONFIGURATION FILES
 
-# Configuration option for rc.local to use tmux. By default screen is used.
-use_tmux=
+# Configuration option for rc.local to use GNU screen/tmux. By default GNU
+# screen is used. Possible values: screen, tmux.
+use_multiplexer=screen
 
 source_config ~/.zsh/rc.local
 
@@ -724,32 +726,32 @@ source_config ~/.zsh/rc.local
 # through ssh.
 if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
     # Get running detached sessions.
-    if [[ -z $use_tmux ]]; then
+    if [[ $use_multiplexer = screen ]]; then
         session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
-    else
+    elif [[ $use_multiplexer = tmux ]]; then
         session=$(tmux list-sessions 2>/dev/null \
                   | sed '/(attached)$/ d; s/^\([0-9]\{1,\}\).*$/\1/; q')
     fi
 
     # As we exec later we have to set the title here.
-    if [[ -z $use_tmux ]]; then
+    if [[ $use_multiplexer = screen ]]; then
         window_preexec "screen"
-    else
+    elif [[ $use_multiplexer = tmux ]]; then
         window_preexec "tmux"
     fi
 
     # Create a new session if none is running.
     if [[ -z $session ]]; then
-        if [[ -z $use_tmux ]]; then
+        if [[ $use_multiplexer = screen ]]; then
             exec screen
-        else
+        elif [[ $use_multiplexer = tmux ]]; then
             exec tmux
         fi
     # Reattach to a running session.
     else
-        if [[ -z $use_tmux ]]; then
+        if [[ $use_multiplexer = screen ]]; then
             exec screen -r $session
-        else
+        elif [[ $use_multiplexer = tmux ]]; then
             exec tmux attach-session -t $session
         fi
     fi