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

Ville Skyttä ville.skytta at iki.fi
Sun Oct 31 19:48:52 UTC 2010


The following commit has been merged in the master branch:
commit ec82c536ed22d5a79eb6d06675fb9f634943fb1f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Oct 31 21:40:22 2010 +0200

    Improve javadoc -overview,-helpfile,-stylesheetfile,-link,-linkoffline completions.

diff --git a/CHANGES b/CHANGES
index 646bfda..6dd9123 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,8 +14,9 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/*, ipmitool, jar, man, mencoder, mkdir, mplayer,
-    povray, rpmbuild, sqlite3, wodim, and general help parsing completions.
+  * Improve /etc/init.d/*, ipmitool, jar, javadoc, man, mencoder, mkdir,
+    mplayer, povray, rpmbuild, sqlite3, wodim, and general help parsing
+    completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/java b/completions/java
index 76d2cd4..5be7ad2 100644
--- a/completions/java
+++ b/completions/java
@@ -176,11 +176,16 @@ _javadoc()
     _get_comp_words_by_ref cur prev
 
     case $prev in
-        -overview|-helpfile|-stylesheetfile)
-            _filedir
+        -overview|-helpfile)
+            _filedir '?(x)htm?(l)'
             return 0
             ;;
-        -d)
+        -stylesheetfile)
+            _filedir css
+            return 0
+            ;;
+        -d|-link|-linkoffline)
+            # TODO: -linkoffline takes two arguments
             _filedir -d
             return 0
             ;;

-- 
bash-completion



More information about the Bash-completion-commits mailing list