aboutsummaryrefslogtreecommitdiffhomepage
path: root/wildcard.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-03-05 20:54:16 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-03-05 20:54:16 -0800
commit4d19bb17a9161fc085e7b308d1ac30ec74186c33 (patch)
treecac5e5e7514ae08c66a43518b531fb86a421d276 /wildcard.cpp
parentb2012467b327db8d518f2b01eed3d529609f7349 (diff)
Break out COMPLETE_NO_CASE and COMPLETE_REPLACES_TOKEN into separate flags, in preparation for upcoming fuzzy completion work
Diffstat (limited to 'wildcard.cpp')
-rw-r--r--wildcard.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/wildcard.cpp b/wildcard.cpp
index f8e1bed0..3177cf35 100644
--- a/wildcard.cpp
+++ b/wildcard.cpp
@@ -225,7 +225,7 @@ static bool wildcard_complete_internal(const wcstring &orig,
wcstring out_completion;
wcstring out_desc = (desc ? desc : L"");
- if (flags & COMPLETE_NO_CASE)
+ if (flags & COMPLETE_REPLACES_TOKEN)
{
out_completion = orig;
}
@@ -292,7 +292,7 @@ static bool wildcard_complete_internal(const wcstring &orig,
}
else if (towlower(*wc) == towlower(*str))
{
- return wildcard_complete_internal(orig, str+1, wc+1, 0, desc, desc_func, out, flags | COMPLETE_NO_CASE);
+ return wildcard_complete_internal(orig, str+1, wc+1, 0, desc, desc_func, out, flags | COMPLETE_CASE_INSENSITIVE | COMPLETE_REPLACES_TOKEN);
}
return false;
}
@@ -1095,7 +1095,7 @@ int wildcard_expand(const wchar_t *wc,
{
completion_t &c = out.at(i);
- if (c.flags & COMPLETE_NO_CASE)
+ if (c.flags & COMPLETE_REPLACES_TOKEN)
{
c.completion = format_string(L"%ls%ls%ls", base_dir, wc_base.c_str(), c.completion.c_str());
}