Merge pull request #243 from EdwardBetts/master

[code/vcsh.git] / _vcsh

diff --git a/_vcsh b/_vcsh
index 6880f728eaf266b0573bd0da9acf556f48428658..9aca0f97095021e28777baffbcea58a1dbe1ef5f 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -63,10 +63,12 @@ function _vcsh-rename () {
 
 function _vcsh-run () {
        (( CURRENT == 2 )) && __vcsh_repositories
 
 function _vcsh-run () {
        (( CURRENT == 2 )) && __vcsh_repositories

-       if (( CURRENT >= 3 )); then
+       (( CURRENT == 3 )) && _command_names -e
+       if (( CURRENT >= 4 )); then
+               # see _precommand in zsh

                words=( "${(@)words[3,-1]}" )
                (( CURRENT -= 2 ))
                words=( "${(@)words[3,-1]}" )
                (( CURRENT -= 2 ))

-               _complete
+               _normal

        fi
 }
 
        fi
 }
 


@@ -142,7 +144,7 @@ function _vcsh () {
                                GIT_DIR=$VCSH_REPO_D/$words[1].git _dispatch git git
                        else
                                curcontext="${curcontext%:*:*}:vcsh-${vcshcommand}:"
                                GIT_DIR=$VCSH_REPO_D/$words[1].git _dispatch git git
                        else
                                curcontext="${curcontext%:*:*}:vcsh-${vcshcommand}:"

-                               _call_function ret _vcsh-${vcshcommand}
+                               _call_function ret _vcsh-${vcshcommand} && (( ret ))

                        fi
                fi
        fi
                        fi
                fi
        fi