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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit e24fc84c8daa7288017a0e2403970235d0a4bc60
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Jan 19 23:14:46 2010 +0200

    Recognize long equivalents to -f and -C when looking for Makefile or dir option.

diff --git a/CHANGES b/CHANGES
index 2fcf3a4..0c3cdb7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,8 +25,8 @@ 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, configure, cvs, gkrellm, gzip, lftp, look, mdadm, modprobe,
-    mplayer, mysqladmin, rsync, screen, service, scp, ssh, sshfs,
+  * Improve chsh, configure, cvs, gkrellm, gzip, lftp, look, make, mdadm,
+    modprobe, mplayer, mysqladmin, rsync, screen, service, scp, ssh, sshfs,
     update-alternatives, vncviewer, 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,
diff --git a/contrib/make b/contrib/make
index 0fdb389..79f373f 100644
--- a/contrib/make
+++ b/contrib/make
@@ -39,9 +39,9 @@ _make()
             --warn-undefined-variables' -- "$cur" ) )
     else
         # before we check for makefiles, see if a path was specified
-        # with -C
+        # with -C/--directory
         for (( i=0; i < ${#COMP_WORDS[@]}; i++ )); do
-            if [[ ${COMP_WORDS[i]} == -C ]]; then
+            if [[ ${COMP_WORDS[i]} == -@(C|-directory) ]]; then
                 # eval for tilde expansion
                 eval makef_dir=${COMP_WORDS[i+1]}
                 break
@@ -49,9 +49,9 @@ _make()
         done
 
         # before we scan for targets, see if a Makefile name was
-        # specified with -f
+        # specified with -f/--file/--makefile
         for (( i=0; i < ${#COMP_WORDS[@]}; i++ )); do
-            if [[ ${COMP_WORDS[i]} == -f ]]; then
+            if [[ ${COMP_WORDS[i]} == -@(f|-?(make)file) ]]; then
                 # eval for tilde expansion
                 eval makef=${COMP_WORDS[i+1]}
                 break

-- 
bash-completion