aboutsummaryrefslogtreecommitdiffhomepage
path: root/expand.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-01-12 12:53:40 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-01-12 12:53:40 -0800
commitb32fcc7a8ef2857e111fc5daac15558545df912b (patch)
tree9dde17b5138147d6890a7ec4df3885678a16ab2a /expand.cpp
parente9c226b8bebe25f54d65a272ccfa7697980d6d28 (diff)
Don't call expand_home_directory from within parser_t::test - it may hang
Diffstat (limited to 'expand.cpp')
-rw-r--r--expand.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/expand.cpp b/expand.cpp
index 04d4def0..1371a374 100644
--- a/expand.cpp
+++ b/expand.cpp
@@ -1644,7 +1644,8 @@ int expand_string(const wcstring &input, std::vector<completion_t> &output, expa
{
wcstring next = in->at(i).completion;
- expand_home_directory(next);
+ if (! (EXPAND_SKIP_HOME_DIRECTORIES & flags))
+ expand_home_directory(next);
if (flags & ACCEPT_INCOMPLETE)