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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 911f3859c8b0ca163323a991fa08a39b3477b492
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Nov 28 20:45:45 2009 +0200

    Turn on -o filenames in _filedir() if compopt is available.

diff --git a/CHANGES b/CHANGES
index 05a7848..a4918fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -43,6 +43,7 @@ bash-completion (2.x)
   * Combine dcop and qdbus completions into the latter.
   * sed usage portability fixes.
   * Fix leaking local variables from various completions.
+  * Turn on -o filenames in _filedir on bash >= 4.
 
   [ Freddy Vulto ]
   * Added _get_pword() helper function, thanks to Sung Pae (Alioth: #312030)
diff --git a/bash_completion b/bash_completion
index a29138c..12a4f3f 100644
--- a/bash_completion
+++ b/bash_completion
@@ -456,6 +456,8 @@ _filedir()
     fi
 
     COMPREPLY=( "${COMPREPLY[@]}" "${toks[@]}" )
+    [ ${#COMPREPLY[@]} -ne 0 ] && type compopt &>/dev/null && \
+        compopt -o filenames
 } # _filedir()
 
 

-- 
bash-completion