X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=f936b91ad2144408044479d5b12334a355a4faff;hb=043a26ea99d84d11423b2dc53949a2df518d2c35;hp=8c57d176fdbf509390f290dd467fff3da5516722;hpb=0d746097c2d7c17c12c0d59e92d8eae6a01c8b89;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 8c57d17..f936b91 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -41,9 +41,12 @@ autoload ${fpath[1]}/^_*(^/:t)
 
 # Simulate hooks using _functions arrays for Zsh versions older then 4.3.4. At
 # the moment only precmd() and preexec() are simulated.
-if [[ $ZSH_VERSION != (4.3.<4->|4.<4->*|<5->*) ]]; then
+#
+# 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=($fpath ~/.zsh/functions/compatibility)
+    fpath=(~/.zsh/functions/compatibility $fpath)
 
     # Run all functions defined in the ${precmd,preexec}_functions arrays.
     function precmd() {
@@ -132,7 +135,7 @@ fi
 # 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.
-if [[ $TERM == screen || $TERM == xterm* ]]; then
+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
@@ -194,7 +197,7 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
 
     # Sets the window title. Works with screen and xterm.
     window_title() {
-        if [[ $TERM == screen ]]; then
+        if [[ $TERM == screen* ]]; then
             print -n "\ek$1\e\\"
 
             # Update window name in stumpwm if running screen in X11 and when
@@ -222,27 +225,40 @@ zmodload zsh/complist
 # Use new completion system, store dumpfile in ~/.zsh/cache to prevent
 # cluttering of ~/.
 autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump
+
+# Use cache to speed up completions.
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path ~/.zsh/cache
+
+# Complete arguments and fix spelling mistakes when possible.
+zstyle ':completion:*' completer _complete _match _correct _approximate
+
 # Make sure the list of possible completions is displayed after pressing <TAB>
 # the first time.
 setopt nolistambiguous
 # Allow completions in the middle of a text, i.e. "/usr/bin/<TAB>whatever"
 # completes like "/usr/bin/<TAB>". Useful when adding new options to commands.
 bindkey "^I" expand-or-complete-prefix
-# Use cache to speed up completions.
-zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
 # Try uppercase if the currently typed string doesn't match. This allows
 # typing in lowercase most of the time and completion fixes the case.
 zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}'
-# Ignore completion functions.
-zstyle ':completion:*:functions' ignored-patterns '_*'
-# Ignore parent directory.
-zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
+
 # Use ls like colors for completions.
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+
 # Make completion lists scrollable so "do you wish to see all n possibilities"
 # is no longer displayed.
 zstyle ':completion:*' list-prompt '%p'
+# Display group name (like 'external command', 'alias', etc.) when there are
+# multiple matches in bold.
+zstyle ':completion:*' format '    %B%d%b:'
+# Display different types of matches separately.
+zstyle ':completion:*' group-name ''
+
+# Ignore completion functions.
+zstyle ':completion:*:functions' ignored-patterns '_*'
+# Ignore parent directory.
+zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
 # When unsetting variables make sure every variable name is only suggested
 # once.
 zstyle ':completion:*:unset:*' ignore-line yes
@@ -352,7 +368,10 @@ exec 2>>(while read line; do
 # RUN COMMANDS
 
 # If not already in screen reattach to a running session or create a new one.
-if [[ $TERM != 'screen' && $TERM != 'dumb' ]]; then
+#
+# screen* is necessary as `screen` uses screen.linux for example for a linux
+# console which would otherwise cause an infinite loop.
+if [[ $TERM != screen* && $TERM != 'dumb' ]]; then
     # Create a new session if none is running.
     if [[ $(screen -list | grep "Detached" | wc -l) == 0 ]]; then
         screen