zsh/rc: update alias expansion in window titles

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index f8adacf317b64b7cde56d1c258c74e47a93dcf2c..b6c359c8f577c58ec1274013b6c55fc9139a7aa1 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -187,8 +187,10 @@ bindkey -a '^N' history-beginning-search-forward
 bindkey '^R' history-incremental-search-backward
 # Also enable my usual use of Ctrl-P/Ctrl-N to get the previous/next matching
 # history entry.
-bindkey -M isearch '^P' history-incremental-search-backward
-bindkey -M isearch '^N' history-incremental-search-forward
+if [[ $ZSH_VERSION == (4.<4->*|<5->*) ]]; then
+    bindkey -M isearch '^P' history-incremental-search-backward
+    bindkey -M isearch '^N' history-incremental-search-forward
+fi
 
 # Automatically push cd-ed directories on the directory stack.
 setopt autopushd
@@ -526,11 +528,17 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
                 program_name=git
                 ;;
             m)
-                program_name=mutt
+                program_name=make
+                ;;
+            p)
+                program_name=less
                 ;;
             v)
                 program_name=vim
                 ;;
+            mu)
+                program_name=mutt
+                ;;
         esac
 
         # Add an exclamation mark at the beginning if running with sudo or if
@@ -732,6 +740,12 @@ zle -C complete-files complete-word _generic
 zstyle ':completion:complete-files:*' completer _files
 bindkey '^F' complete-files
 
+# Completion for my wrapper scripts
+compdef slocate=locate
+compdef srsync=rsync
+compdef srsync-incremental=rsync
+compdef svalgrind=valgrind
+
 
 # CUSTOM ALIASES AND FUNCTIONS