Merge branch 'master' into 1.x

2011-01-11 09:06:58 +01:00 · 2011-01-11 09:06:58 +01:00 · cf4fe7f7a9
commit cf4fe7f7a9
parent 2349fc114d 8843071002
1 changed files with 3 additions and 2 deletions
--- a/completions/python
+++ b/completions/python
@ -21,8 +21,9 @@ _python()
                -- "$cur" ) )
            return 0
            ;;
-        !(python?([23])|-?))
-            [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
+        !(?(*/)python*([0-9.])|-?))
+            [[ $COMP_CWORD -lt 2 || ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] \
+                && _filedir
            ;;
    esac