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

[David Paleino]

The following commit has been merged in the master branch:
commit 653fc03d6b9e03cf431eebc4bb3cf3c687424bb1
Author: David Paleino <d.paleino at gmail.com>
Date:   Fri Jun 5 20:53:51 2009 +0200

    Revert "Don't assume "sed" being GNU sed, use "gsed" whenever available (Debian: #501479, Alioth: #311393)"
    
    This reverts commit 6170eb0001510426ccc7461e60e46c68992bcd14.
    
    Conflicts:
    
    	CHANGES

diff --git a/CHANGES b/CHANGES
index f93aea0..2100bdc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,8 +11,6 @@ bash-completion (1.x)
   * Fix typo in .ass subtitles completion for mplayer (Debian: #531337)
   * Fix regression on man(1) completion: also complete on local .3pm files
     (Debian: #531343)
-  * Don't assume "sed" being GNU sed, use "gsed" whenever available
-    (Debian: #501479, Alioth: #311393)
   * Split mutt completion to contrib/mutt
   * Split iconv completion to contrib/iconv
   * Split dict completion to contrib/dict
diff --git a/bash_completion b/bash_completion
index ee79116..0a3fda5 100644
--- a/bash_completion
+++ b/bash_completion
@@ -195,7 +195,7 @@ have()
 
 # use GNU sed if we have it, since its extensions are still used in our code
 #
-have gsed && alias sed=gsed
+[ $USERLAND != GNU ] && have gsed && alias sed=gsed
 
 # This function checks whether a given readline variable
 # is `on'.
@@ -2258,6 +2258,3 @@ unset UNAME USERLAND default dirnames filenames have nospace bashdefault plusdir
 
 set $BASH_COMPLETION_ORIGINAL_V_VALUE
 unset BASH_COMPLETION_ORIGINAL_V_VALUE
-
-# remove aliases we set earlier
-unalias sed

-- 
bash-completion