diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-27 13:37:14 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-27 13:37:14 -0700 |
| commit | 964c7e6f3be262ac4c6b0285edcd4a685fb5bc97 (patch) | |
| tree | eab4cd83357714a23ff86bfaff853929359f832d /parser.cpp | |
| parent | 630b0515ad494225c8c8532670ffd3d1e2359140 (diff) | |
| parent | cf766b55cca979745f6c218d78f9cdcc297b3f20 (diff) | |
Merge branch 'master' into ast
Conflicts:
complete.cpp
Diffstat (limited to 'parser.cpp')
| -rw-r--r-- | parser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2011,7 +2011,7 @@ int parser_t::parse_job(process_t *p, { const wchar_t *cmd = args.at(0).completion.c_str(); - + /* We couldn't find the specified command. @@ -2034,20 +2034,20 @@ int parser_t::parse_job(process_t *p, if (equals_ptr != NULL) { /* Try to figure out if this is a pure variable assignment (foo=bar), or if this appears to be running a command (foo=bar ruby...) */ - + const wcstring name_str = wcstring(cmd, equals_ptr - cmd); //variable name, up to the = const wcstring val_str = wcstring(equals_ptr + 1); //variable value, past the = - + wcstring next_str; if (tok_peek_next(tok, &next_str) == TOK_STRING && ! next_str.empty()) { wcstring ellipsis_str = wcstring(1, ellipsis_char); if (ellipsis_str == L"$") ellipsis_str = L"..."; - + /* Looks like a command */ debug(0, - _( L"Unknown command '%ls'. Did you mean to run %ls with a modified environment? Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing 'help set'."), + _(L"Unknown command '%ls'. Did you mean to run %ls with a modified environment? Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing 'help set'."), cmd, next_str.c_str(), name_str.c_str(), |