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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit f1b3be235722d1ea51160acf50120eb88995a5b7
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Oct 31 14:38:17 2009 +0200

    Drop compgen/complete option and bash version related global variables.

diff --git a/CHANGES b/CHANGES
index 1a5a84c..755aa22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,7 +25,11 @@ bash-completion (2.x)
   * Speed up installed rpm package completion on SUSE, based on work by
     Marco Poletti (Alioth: #312021).
   * Improve sourcing snippets from completion dirs.
-  * Drop support for bash < 3.
+  * Drop support for bash < 3.  The compatiblity global variables $bashN,
+    $default, $dirnames, $filenames, $compopt, $nospace, $bashdefault, and
+    $plusdirs have been dropped too.  3rd party completions should switch
+    to using the complete/compgen features directly, and BASH_VERSINFO
+    for bash version checks.
   * Fix sed error in qdbus completions containing slashes (Debian: 552631).
   * Add /sbin to $PATH when invoking ifconfig and iwconfig.
 
diff --git a/bash_completion b/bash_completion
index 9e29921..2a053b9 100644
--- a/bash_completion
+++ b/bash_completion
@@ -56,25 +56,6 @@ case ${UNAME} in
     *) USERLAND=${UNAME} ;;
 esac
 
-# features supported by bash 2.05 and higher
-declare -r bash205=$BASH_VERSION 2>/dev/null || :
-default="-o default"
-dirnames="-o dirnames"
-filenames="-o filenames"
-compopt=:
-# features supported by bash 2.05b and higher
-declare -r bash205b=$BASH_VERSION 2>/dev/null || :
-nospace="-o nospace"
-# features supported by bash 3.0 and higher
-declare -r bash3=$BASH_VERSION 2>/dev/null || :
-bashdefault="-o bashdefault"
-plusdirs="-o plusdirs"
-# features supported by bash 4.0 and higher
-if [ ${BASH_VERSINFO[0]} -gt 3 ]; then
-    declare -r bash4=$BASH_VERSION 2>/dev/null || :
-    compopt=compopt
-fi
-
 # Turn on extended globbing and programmable completion
 shopt -s extglob progcomp
 
@@ -1689,8 +1670,7 @@ unset i
 [ $BASH_COMPLETION != ~/.bash_completion -a -r ~/.bash_completion ] \
     && . ~/.bash_completion
 unset -f have
-unset UNAME USERLAND default dirnames filenames have nospace bashdefault \
-    plusdirs compopt
+unset UNAME USERLAND have
 
 set $BASH_COMPLETION_ORIGINAL_V_VALUE
 unset BASH_COMPLETION_ORIGINAL_V_VALUE

-- 
bash-completion