From d734bf42af6e54407c0cc40935f54e2d85ae9113 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 14 Jul 2011 02:02:16 +1000
Subject: Allow full path names to be matched by 'wildignore'.

Closes issue #567.
---
 common/locale/en-US/options.xml | 5 +++--
 common/modules/io.jsm           | 8 +++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'common')

diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index bf45d564..bace1f07 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -1613,8 +1613,9 @@
     <default>&option.wildignore.default;</default>
     <description>
         <p>
-            List of file patterns to ignore when completing files. For example,
-            the following will ignore object files and Vim swap files:
+            List of path name patterns to ignore when completing files and
+            directories. For example, the following will ignore object files
+            and Vim swap files:
         </p>
 
         <set opt="wildignore"><str delim="'">\.o$</str>,<str delim="'">^\..*\.s[a-z]{2}$</str></set>
diff --git a/common/modules/io.jsm b/common/modules/io.jsm
index 81b7c001..065da969 100644
--- a/common/modules/io.jsm
+++ b/common/modules/io.jsm
@@ -907,10 +907,8 @@ unlet s:cpo_save
             };
             context.compare = function (a, b) b.isdir - a.isdir || String.localeCompare(a.text, b.text);
 
-            if (modules.options["wildignore"]) {
-                let wig = modules.options.get("wildignore");
-                context.filters.push(function (item) item.isdir || !wig.getKey(item.path));
-            }
+            if (modules.options["wildignore"])
+                context.filters.push(function (item) !modules.options.get("wildignore").getKey(item.path));
 
             // context.background = true;
             context.key = dir;
@@ -1077,7 +1075,7 @@ unlet s:cpo_save
         options["shellcmdflag"];
 
         options.add(["wildignore", "wig"],
-            "List of file patterns to ignore when completing file names",
+            "List of path name patterns to ignore when completing files and directories",
             "regexplist", "");
     }
 });
-- 
cgit v1.2.3