[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-161-ga614028

Ville Skyttä ville.skytta at iki.fi
Sun May 1 12:28:26 UTC 2011


The following commit has been merged in the master branch:
commit a785f1c2f96fcf8dbbbf424b68d87aefeb67329a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun May 1 12:10:16 2011 +0300

    autotools, xsltproc: Use _parse_help instead of _longopt.

diff --git a/completions/autoconf b/completions/autoconf
index 05d671a..64eb502 100644
--- a/completions/autoconf
+++ b/completions/autoconf
@@ -32,7 +32,7 @@ _autoconf()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return
     fi
 
@@ -69,7 +69,7 @@ _autoreconf()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return 0
     fi
 
@@ -103,7 +103,7 @@ _autoscan()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/automake b/completions/automake
index 0f93ea5..e1030f2 100644
--- a/completions/automake
+++ b/completions/automake
@@ -28,7 +28,7 @@ _automake()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt $1
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return
     fi
 
@@ -67,7 +67,7 @@ _aclocal()
 
     $split && return 0
 
-    _longopt $1
+    COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
 } &&
 complete -F _aclocal aclocal aclocal-1.11
 
diff --git a/completions/xsltproc b/completions/xsltproc
index 32efcab..dcf4d07 100644
--- a/completions/xsltproc
+++ b/completions/xsltproc
@@ -40,7 +40,8 @@ _xsltproc()
         return 0
 
     if [[ "$cur" == -* ]]; then
-        _longopt xsltproc
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+        COMPREPLY=( "${COMPREPLY[@]%:}" )
     else
 	_filedir '@(xsl|xslt|xml)'
     fi

-- 
bash-completion



More information about the Bash-completion-commits mailing list