aboutsummaryrefslogtreecommitdiffhomepage
path: root/expand.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-05 16:42:24 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-05 16:42:24 -0800
commit5ad6849d4e6aa76a72b671b50b143ef80d381a75 (patch)
treeb381f5b239085d378af1865d82f549e33ba9827f /expand.cpp
parent7fcf25a78f7241b9ee50ea9d5cbf2b0646c45b78 (diff)
Work on new history implementation
Diffstat (limited to 'expand.cpp')
-rw-r--r--expand.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/expand.cpp b/expand.cpp
index bc23d582..846c155e 100644
--- a/expand.cpp
+++ b/expand.cpp
@@ -1506,7 +1506,7 @@ static void remove_internal_separator2( wcstring &s, int conv )
}
-int expand_string2( const wcstring &input, std::vector<completion_t> &output, int flags )
+int expand_string( const wcstring &input, std::vector<completion_t> &output, int flags )
{
parser_t parser(PARSER_TYPE_ERRORS_ONLY);
std::vector<completion_t> list1, list2;
@@ -1725,7 +1725,7 @@ bool expand_one(wcstring &string, int flags) {
return true;
}
- if (expand_string2(string, completions, flags)) {
+ if (expand_string(string, completions, flags)) {
if (completions.size() == 1) {
string = completions.at(0).completion;
result = true;