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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 2d4ebbaf25d324ad03e9f231ab7fe9ec55b259a7
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Dec 20 23:44:59 2010 +0200

    Ignore muttrc source entries that are not files (Alioth: #312881).

diff --git a/CHANGES b/CHANGES
index 49a44a5..e89aeef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@ bash-completion (2.x)
   * Add/improve various autotools completions.
   * Add *.apk to unzip and jar filename completions.
   * Do not load bash_completion in profile.d script if progcomp is not enabled.
+  * Ignore muttrc source entries that are not files (Alioth: #312881).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/completions/mutt b/completions/mutt
index b8124f2..a753a65 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -58,7 +58,7 @@ _muttconffiles()
     while [[ "$1" ]]; do
         newconffiles=( $(sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval echo $1) ) )
         for file in "${newconffiles[@]}"; do
-            [[ ! "$file" || "${sofar/ ${file} / }" != "$sofar" ]] &&
+            [[ ! -f "$file" || "${sofar/ ${file} / }" != "$sofar" ]] &&
                 continue
             sofar="$sofar $file"
             sofar=" $(eval _muttconffiles \"$sofar\" $file) "

-- 
bash-completion