[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-39-g2c78ae3

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 70a3b8a8b449c12d425f249c3eb2159067f66718
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Mar 21 19:42:22 2011 +0200

    xz* option completion updates.

diff --git a/CHANGES b/CHANGES
index 9427885..8240aec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Add pxz and reptyr completions.
-  * Improve aspell, gendiff, smartctl, and tar completions.
+  * Improve aspell, gendiff, smartctl, tar, xz, and xzdec completions.
   * Try harder to find the correct perl executable to run the perl helper with.
   * Drop rpm query support for rpm < 4.1.
   * Split rpm and rpmbuild completions and improve them both.
diff --git a/completions/xz b/completions/xz
index ec6d9b2..45fc0d3 100644
--- a/completions/xz
+++ b/completions/xz
@@ -9,11 +9,11 @@ _xz()
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '--compress --decompress --test --list \
-            --keep --force --stdout --suffix --files --files0 --format --check \
-            -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 --fast --best --extreme --memory \
+            --keep --force --stdout --no-sparse --suffix --files --files0 \
+            --format --check -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 --extreme --memory \
             --lzma1 --lzma2 --x86 --powerpc --ia64 --arm --armthumb --sparc \
-            --delta --quiet --verbose --no-warn --help --long-help --version' \
-            -- "$cur" ) )
+            --delta --quiet --verbose --no-warn --robot --info-memory --help \
+            --long-help --version' -- "$cur" ) )
         return 0
     fi
 
@@ -31,7 +31,7 @@ _xz()
             return 0
             ;;
         -C|--check)
-            COMPREPLY=( $( compgen -W 'crc32 crc64 sha256' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'crc32 crc64 sha256 none' -- "$cur" ) )
             return 0
             ;;
         -F|--format)
@@ -42,7 +42,7 @@ _xz()
             # argument required but no completions available
             return 0
             ;;
-        -h|--help|-H|--long-help|-V|--version)
+        -h|--help|-H|--long-help|-V|--version|--info-memory)
             # all other arguments are noop with these
             return 0
             ;;
@@ -69,7 +69,8 @@ _xzdec()
     _get_comp_words_by_ref cur prev
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--memory --help --version' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--memory --quiet --help --version' \
+            -- "$cur" ) )
         return 0
     fi
 

-- 
bash-completion