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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit da990d18d9a55aab7f37f67ff02c646a2428e5f8
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Apr 21 23:45:39 2010 +0300

    Use generic long option instead of HTML file completion for curl.

diff --git a/CHANGES b/CHANGES
index 6705d1a..a0c22c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,10 +25,11 @@ bash-completion (2.x)
   * Apply cardctl completion to pccardctl too.
   * Apply pine completion to alpine too.
   * Remove many unnecessary short option completions where long ones exist.
-  * Improve chsh, chgrp, chown, configure, cvs, find, gkrellm, gzip, iconv,
-    lftp, look, lzma, make, man, mdadm, modprobe, mount, mplayer, mysqladmin,
-    perldoc, rsync, screen, service, scp, ssh, sshfs, update-alternatives,
-    vncviewer, wget, yp-tools, and general hostname completions.
+  * Improve chsh, chgrp, chown, configure, curl, cvs, find, gkrellm, gzip,
+    iconv, lftp, look, lzma, make, man, mdadm, modprobe, mount, mplayer,
+    mysqladmin, perldoc, rsync, screen, service, scp, ssh, sshfs,
+    update-alternatives, vncviewer, wget, yp-tools, and general hostname
+    completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
   * Add cvsps, dragon, fusermount, jarsigner, k3b, lftpget, pm-utils, rtcwake,
     pack200, unpack200, pbzip2, pbunzip2, pbzcat, pigz and unpigz completions.
diff --git a/bash_completion b/bash_completion
index c73ea1d..570623e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -106,7 +106,7 @@ complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)
 complete -f -X '!*.@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR])' wine
 complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme
 # konqueror not here on purpose, it's more than a web/html browser
-complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon curl dillo elinks amaya firefox mozilla-firefox iceweasel google-chrome chromium-browser epiphany
+complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon dillo elinks amaya firefox mozilla-firefox iceweasel google-chrome chromium-browser epiphany
 complete -f -X '!*.@(sxw|stw|sxg|sgl|doc?([mx])|dot?([mx])|rtf|txt|htm|html|odt|ott|odm)' oowriter
 complete -f -X '!*.@(sxi|sti|pps?(x)|ppt?([mx])|pot?([mx])|odp|otp)' ooimpress
 complete -f -X '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|[ct]sv|ods|ots)' oocalc
@@ -1799,7 +1799,7 @@ for i in a2ps autoconf automake bc gprof ld nm objcopy objdump readelf strip \
     touch vdir awk gperf grep grub indent less m4 sed shar date \
     tee who texindex cat csplit cut expand fmt fold head \
     md5sum nl od paste pr ptx sha1sum sort split tac tail tr unexpand \
-    uniq wc ldd bash id irb mkdir rmdir wget; do
+    uniq wc ldd bash id irb mkdir rmdir wget curl; do
     have $i && complete -F _longopt -o filenames $i
 done
 

-- 
bash-completion