zsh/rc: Major update of completion settings.

The overall behavior is unchanged, but many details were improved and
better documented.

diff --git a/zsh/rc b/zsh/rc
index f82abc75268ba2332901abcf196f5477e7c1a60d..236374b737ade57f984da916567ccf905332398b 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -466,31 +466,66 @@ autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump
 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
-
+# 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
 # If there are multiple matches after pressing <Tab> always display them
-# immediately without requiring another <Tab>. a<Tab> lists aaa, aab, aac as
-# possible completions if the directory contains aaa, aab, aac, bbb.
+# immediately without requiring another <Tab>. a<Tab> completes to aa and
+# lists aaa, aab, aac as possible completions if the directory contains aaa,
+# aab, aac, bbb instead of only completing to aa.
 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
+# Support completions in the middle of a word, without this option zsh jumps
+# to the end of the word before the completion process begins. Is required for
+# the _prefix completer.
+setopt completeinword
+
+zstyle ':completion:::::' completer \
+    _expand _complete _prefix _ignored _approximate
+
 # 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}'
+# typing in lowercase most of the time and completion fixes the case. Don't
+# perform these fixes in _approximate to prevent it from changing the input
+# too much. Thanks to the book "From Bash to Z Shell" page 249.
+zstyle ':completion:*:(^approximate):*' matcher-list 'm:{a-z}={A-Z}'
+
+# Allow one mistake per three characters. Thanks to the book "From Bash to Z
+# Shell" page 248.
+zstyle -e ':completion:*:approximate:*' max-errors \
+    'reply=( $(( ($#PREFIX + $#SUFFIX) / 3 )) )'
+
+# Expand shell wildcards to all matching files after <Tab>. echo *<Tab>
+# results in a b c if the directory contains the files a, b, c. Thanks to the
+# book "From Bash to Z Shell" page 246.
+zstyle ':completion:*:expand:*' tag-order all-expansions
+# Keep prefixes unexpanded if possible: $HOME/<Tab> doesn't expand $HOME,
+# while $HOME<Tab> does.
+zstyle ':completion:*:expand:*' keep-prefix yes
+
+# When completing multiple path components display all matching ambiguous
+# components. For example /u/s/d/r/README<Tab> lists all matching READMEs
+# instead of just the matching paths up to the r/ component. Can be slow if
+# there are many matching files.
+zstyle ':completion:*' list-suffixes yes
 
 # 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. Display current position in percent (%p).
-zstyle ':completion:*' list-prompt '%p'
+zstyle ':completion:*:default' list-prompt '%p'
 # Display group name (%d) (like 'external command', 'alias', etc.), in bold.
-zstyle ':completion:*' format '    %B%d%b:'
+# Also display a message if _approximate found errors and if no matches were
+# found.
+zstyle ':completion:*'             format '    %B%d%b:'
+zstyle ':completion:*:corrections' format '    %B%d%b (errors: %e)'
+zstyle ':completion:*:warnings'    format '    %Bno matches for %d%b'
 # Display different types of matches separately.
 zstyle ':completion:*' group-name ''
 
+# Separate man pages by section.
+zstyle ':completion:*' separate-sections yes
+
 # Don't draw trailing / in bold (new in zsh 4.3.11). Thanks to Mikachu in #zsh
 # on Freenode for the fix (2010-12-17 13:46 CET).
 zle_highlight=(suffix:none)
@@ -499,18 +534,20 @@ zle_highlight=(suffix:none)
 zstyle ':completion:*:functions' ignored-patterns '_*'
 # Ignore parent directory.
 zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
-# Always complete one value (file name) only once in the current line. This
-# makes it easy to complete multiple values because I can just press tab to
-# get all possible values. Otherwise I would have to skip the first value
-# again and again.
-zstyle ':completion:*' ignore-line yes
+# Always complete file names only once in the current line. This makes it easy
+# to complete multiple file names because I can just press tab to get all
+# possible values. Otherwise I would have to skip the first value again and
+# again. Thanks to Mikachu in #zsh on Freenode (2011-08-11 14:42 CEST) for the
+# hint to use other. other is necessary so prefix<Tab> lists both prefix and
+# prefixrest if the directory contains prefix and prefixrest.
+zstyle ':completion:*:all-files' ignore-line other
 # Except for mv and cp, because I often want to use to similar names, so I
 # complete to the same and change it.
-zstyle ':completion:*:(mv|cp):*' ignore-line no
+zstyle ':completion:*:(mv|cp):all-files' ignore-line no
+
 # Don't complete ./config.* files, this makes running ./configure much
 # simpler. Thanks to Nomexous in #zsh on Freenode (2010-03-16 01:54 CET)
 zstyle ':completion:*:*:-command-:*' ignored-patterns './config.*'
-
 # Don't complete unwanted files with Vim. Thanks to Nomexous in #zsh on
 # Freenode (2010-06-06 04:54 CEST). See below for a way to complete them.
 zstyle ':completion:*:*:vim:*:all-files' ignored-patterns \