[Bash-completion-commits] [SCM] bash-completion branch, 1.x, updated. 343070b0fbf523535cd8107daf8d878fd81f37f7

[David Paleino]

The following commit has been merged in the 1.x branch:
commit 343070b0fbf523535cd8107daf8d878fd81f37f7
Merge: c0bba557b5a6fb17e7e2bf07a182965cb581b4ba 8455b7ef38b151ef081cad873171eb4ee1faa20f
Author: David Paleino <d.paleino at gmail.com>
Date:   Sun Oct 4 00:21:53 2009 +0200

    Merge branch 'master' into 1.x
    
    Changes by fvu merged for 1.1

diff --combined bash_completion
index 8ebe534,3cacea7..3bf9c62
--- a/bash_completion
+++ b/bash_completion
@@@ -24,7 -24,7 +24,7 @@@
  #
  #   http://bash-completion.alioth.debian.org/
  #
 -#   RELEASE: 1.x
 +#   RELEASE: 1.1
  
  if [[ $- == *v* ]]; then
  	BASH_COMPLETION_ORIGINAL_V_VALUE="-v"
@@@ -42,7 -42,8 +42,7 @@@ f
  #
  [ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
  [ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
 -[ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d
 -readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR
 +readonly BASH_COMPLETION BASH_COMPLETION_DIR
  
  # Set a couple of useful vars
  #
@@@ -366,7 -367,7 +366,7 @@@ __get_cword4(
  
  	cur=${cur:$word_start}
  	printf "%s" "$cur"
- } # _get_cword4()
+ } # __get_cword4()
  
  
  # This function performs file and directory completion. It's better than
@@@ -1637,6 -1638,7 +1637,6 @@@ if [ -d $BASH_COMPLETION_COMPAT_DIR -a 
  	done
  fi
  if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
 -     $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR -a \
       -x $BASH_COMPLETION_DIR ]; then
  	for i in $BASH_COMPLETION_DIR/*; do
  		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&

-- 
bash-completion