zsh: Only use stumpish when stumpwm is running.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index e17deede06e225861738d4706f65b0f9b7ae7589..a8486a746e303a824dbb77f5223de3c14305561b 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -157,8 +157,8 @@ fi
 # stops precmd() resets the windows' name to 'zsh'.
 #
 # It works with screen and xterm. If screen is running in X11 (DISPLAY is set)
-# and stumpwm is used (it's tested if stumpish is available) then the window
-# title is also set in stumpwm using stumpish.
+# and stumpwm is running then the window title is also set in stumpwm using
+# stumpish.
 #
 # If a command is run with sudo or if the shell is running as root then a ! is
 # added at the beginning of the command to make this clear. If a command is
@@ -167,8 +167,8 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
     # Set to a non empty value to reset the window name in the next precmd()
     # call.
     window_reset=yes
-    # Set to a non empty value when the stump window manager is available.
-    which stumpwm &> /dev/null
+    # Set to a non empty value when the stump window manager is running.
+    ps aux | grep -q stumpwm | grep -v grep
     if [[ $? -eq 0 ]]; then
         window_stumpwm=yes
     fi
@@ -387,11 +387,6 @@ function ll() {
     la -l $*
 }
 
-# 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
-
 # I sometimes confuse editor and shell, print a warning to prevent I exit the
 # shell.
 alias :q='echo "This is not Vim!" >&2'
@@ -410,6 +405,24 @@ alias df='df -h'
 # patches can easily be opened.
 alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
 
+# Display all branches (except stash) in gitk but only 200 commits as this is
+# much faster. Also put in the background and disown. Thanks to sitaram in
+# #git on Freenode (2009-04-20 15:51).
+gitk() {
+    command gitk \
+        --max-count=200 \
+        $(git rev-parse --symbolic-full-name --remotes --branches) \
+        $@ &
+    disown %command
+}
+# Same for tig (except the disown part as it's no GUI program).
+tig() {
+    command tig \
+        --max-count=200 \
+        $(git rev-parse --symbolic-full-name --remotes --branches) \
+        $@
+}
+
 
 # RUN COMMANDS