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

[David Paleino]

The following commit has been merged in the master branch:
commit 6170eb0001510426ccc7461e60e46c68992bcd14
Author: David Paleino <d.paleino at gmail.com>
Date:   Fri Jun 5 08:13:46 2009 +0200

    Don't assume "sed" being GNU sed, use "gsed" whenever available (Debian: #501479, Alioth: #311393)

diff --git a/CHANGES b/CHANGES
index 153c756..df99934 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,8 @@ 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)
 
   [ Ville Skyttä ]
   * Split yum and yum-arch completion into contrib/yum.
diff --git a/bash_completion b/bash_completion
index d6bdfdb..15e9b34 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
 #
-[ $USERLAND != GNU ] && have gsed && alias sed=gsed
+have gsed && alias sed=gsed
 
 # This function checks whether a given readline variable
 # is `on'.
@@ -3673,3 +3673,6 @@ 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