X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=201e17c13a5ed103ffdb67e65c9e9b03e53430ea;hb=9b3e741610ff2fbc754a5700e3e4cb0962670e61;hp=f8adacf317b64b7cde56d1c258c74e47a93dcf2c;hpb=861dc978760ca60aced1dc14dea0ac72c01f002b;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index f8adacf..201e17c 100644
--- 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
@@ -627,10 +635,26 @@ autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump
 zstyle ':completion:*' use-cache yes
 zstyle ':completion:*' cache-path ~/.zsh/cache
 
+# List all files in the current directory when pressing tab on an empty input,
+# behave like complete-word otherwise. Thanks to John Eikenberry [1] for the
+# code, read on 2014-03-15.
+#
+# [1]: http://unix.stackexchange.com/a/32426
+complete-word-or-complete-list-of-files() {
+    if [[ $#BUFFER == 0 ]]; then
+        BUFFER='ls '
+        CURSOR=3
+        zle list-choices
+        zle backward-kill-word
+    else
+        zle complete-word
+    fi
+}
+zle -N complete-word-or-complete-list-of-files
 # Let the completion system handle all completions, including expanding of
 # shell wildcards (which is handled by other shell mechanisms if the default
 # expand-or-complete is used).
-bindkey '^I' complete-word
+bindkey '^I' complete-word-or-complete-list-of-files
 # If there are multiple matches after pressing <Tab> always display them
 # immediately without requiring another <Tab>. a<Tab> completes to aa and
 # lists aaa, aab, aac as possible completions if the directory contains aaa,
@@ -732,6 +756,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