Refactored completion

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 6e04b1aa3f243e802daed2b65909304c76e1a361..39fa3a5373f2565e57df2e839c1789d6f2118e51 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -5,6 +5,7 @@ setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
 setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
 setopt PIPE_FAIL
+setopt MULTIBYTE
 
 setopt RM_STAR_SILENT
 export LISTMAX=9999
@@ -91,10 +92,11 @@ ssht() {
     ssh -C -t $1 tmux attach -t0
 }
 
-autoload -U zsh-mime-setup
-zsh-mime-setup
+autoload -U zsh-mime-setup ; zsh-mime-setup
 alias -s html=lynx
 alias -s txt=less
+
+autoload -U zmv
 # }}}
 
 # Faster movement {{{
@@ -161,11 +163,32 @@ bindkey -s "\eOP" " inc\n" # F1
 # }}}
 
 # Completion {{{
+zstyle ":completion:*" list-colors ""
+
 zstyle ":completion:*:functions" ignored-patterns "_*"
-zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
+zstyle ":completion:*:manuals" separate-sections true
+
+zstyle ":completion:*" group-name ""
+zstyle ":completion:*:messages" format "%d"
+zstyle ":completion:*:warnings" format "%F{red}no matches: %d%f"
+zstyle ":completion:*:*:*:*:descriptions" format "%B... %d%b"
+zstyle ":completion:*:files:*:*:descriptions" format ""
+
+zstyle ":completion:*" file-patterns "%p:globbed" "*"
+zstyle ":completion:*" matcher-list "" "m:{a-z-}={A-Z_}" "r:|?=** m:{a-z-}={A-Z_}"
+zstyle ":completion:*" completer _mycomp _parameters _ignored
+
 _mycomp () {
-    [[ ${words[1]} != man ]] || { _man && return 0 }
-    [[ $CURRENT -eq 1 ]] && _command_names || _files && return 0
+    [[ $CURRENT -eq 1 ]] && curcontext="${curcontext%:*:*}:-command-:" \
+        _command_names && return
+    local has_files
+    curcontext=:files:${curcontext#:*:} _files && has_files=1
+    [[ ${words[1]} == man ]] && curcontext=:man:${curcontext#:*:} \
+        _dispatch "" man man "" -default- && _value && return
+    [[ ${words[1]} == info ]] && curcontext=:info:${curcontext#:*:} \
+        _dispatch "" info info "" -default- && return
+    [[ $has_files ]] && return
+
     # MAGIC_EQUAL_SUBST {{{
     [[ $PREFIX = *\=* ]] || return 1
     compstate[parameter]=${PREFIX%%\=*}
@@ -173,9 +196,8 @@ _mycomp () {
     _value
     # }}}
 }
-zstyle ":completion:*" completer _mycomp _parameters
+
 autoload -U compinit ; compinit -d /tmp/.zcompdump
-zstyle ":completion:*:default" list-colors ""
 autoload -U complist
 # }}}