The following commit has been merged in the master branch:
commit 4a71a1c175230f5079747aab269863fc8e995f42
Author: Guillaume Rousse <[email protected]>
Date:   Wed May 27 18:49:01 2009 +0200

    split python completion

diff --git a/Makefile.am b/Makefile.am
index b50d3dd..897ee09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,7 @@ bashcomp_DATA = contrib/ant \
                contrib/postgresql \
                contrib/postfix \
                contrib/povray \
+               contrib/python \
                contrib/qdbus \
                contrib/qemu \
                contrib/quota-tools \
diff --git a/bash_completion b/bash_completion
index fab9e41..944464b 100644
--- a/bash_completion
+++ b/bash_completion
@@ -3942,57 +3942,6 @@ _update_alternatives()
 complete -F _update_alternatives update-alternatives alternatives
 }
 
-# Python completion
-#
-have python &&
-_python()
-{
-       local prev cur
-
-       COMPREPLY=()
-       cur=`_get_cword`
-       prev=${COMP_WORDS[COMP_CWORD-1]##*/}
-
-       case "$prev" in
-       -Q)
-               COMPREPLY=( $( compgen -W "old new warn warnall" -- $cur ) )
-               return 0
-               ;;
-       -W)
-               COMPREPLY=( $( compgen -W "ignore default all module once 
error" -- $cur ) )
-               return 0
-               ;;
-       -c)
-               _filedir '@(py|pyc|pyo)'
-               return 0
-               ;;
-       !(python|-?))
-               [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
-               ;;
-       esac
-
-
-       # if '-c' is already given, complete all kind of files.
-       for (( i=0; i < ${#comp_wor...@]}-1; i++ )); do
-               if [[ ${COMP_WORDS[i]} == -c ]]; then
-                       _filedir
-               fi
-       done
-
-
-       if [[ "$cur" != -* ]]; then
-               _filedir '@(py|pyc|pyo)'
-       else
-               COMPREPLY=( $( compgen -W "- -d -E -h -i -O -Q -S -t -u \
-                                          -U -v -V -W -x -c" -- $cur ) )
-       fi
-
-
-
-       return 0
-} &&
-complete -F _python $filenames python
-
 # lilo(8) completion
 #
 have lilo && {
diff --git a/contrib/python b/contrib/python
new file mode 100644
index 0000000..ffb55a4
--- /dev/null
+++ b/contrib/python
@@ -0,0 +1,53 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for python
+
+have python &&
+_python()
+{
+       local prev cur
+
+       COMPREPLY=()
+       cur=`_get_cword`
+       prev=${COMP_WORDS[COMP_CWORD-1]##*/}
+
+       case "$prev" in
+       -Q)
+               COMPREPLY=( $( compgen -W "old new warn warnall" -- $cur ) )
+               return 0
+               ;;
+       -W)
+               COMPREPLY=( $( compgen -W "ignore default all module once 
error" -- $cur ) )
+               return 0
+               ;;
+       -c)
+               _filedir '@(py|pyc|pyo)'
+               return 0
+               ;;
+       !(python|-?))
+               [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
+               ;;
+       esac
+
+
+       # if '-c' is already given, complete all kind of files.
+       for (( i=0; i < ${#comp_wor...@]}-1; i++ )); do
+               if [[ ${COMP_WORDS[i]} == -c ]]; then
+                       _filedir
+               fi
+       done
+
+
+       if [[ "$cur" != -* ]]; then
+               _filedir '@(py|pyc|pyo)'
+       else
+               COMPREPLY=( $( compgen -W "- -d -E -h -i -O -Q -S -t -u \
+                                          -U -v -V -W -x -c" -- $cur ) )
+       fi
+
+
+
+       return 0
+} &&
+complete -F _python $filenames python

-- 
bash-completion

_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/bash-completion-commits

Reply via email to