[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 536a780c2ec7359988e28df79cf24e2b4badab49

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 536a780c2ec7359988e28df79cf24e2b4badab49
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Dec 9 01:06:47 2009 +0200

    Drop short options from screen completions where long(er) ones exist, add --help and --version.

diff --git a/CHANGES b/CHANGES
index 438127d..1ae6a04 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,7 @@ bash-completion (2.x)
   * Apply pine completion to alpine too.
   * Remove many unnecessary short option completions where long ones exist.
   * Improve configure, cvs, gkrellm, lftp, mdadm, modprobe, mplayer,
-    mysqladmin, service, scp, ssh, and general hostname completions.
+    mysqladmin, screen, service, scp, ssh, and general hostname completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
   * Add jarsigner, k3b, lftpget, pack200 and unpack200 completions.
   * Don't overwrite other host completions when completing from multiple
diff --git a/contrib/screen b/contrib/screen
index 2118e2f..253c9d5 100644
--- a/contrib/screen
+++ b/contrib/screen
@@ -53,9 +53,9 @@ _screen()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-a -A -c -d -D -e -f -fn -fa -h -i \
-            -l -ln -ls -list -L -m -O -p -q -r -R -s -S -t -U -v \
-            -wipe -x -X' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-a -A -c -d -D -e -f -fn -fa -h -i -ln \
+            -list -L -m -O -p -q -r -R -s -S -t -U -v -wipe -x -X --help \
+            --version' -- "$cur" ) )
     fi
 } &&
 complete -F _screen -o default screen

-- 
bash-completion