diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-16 01:48:21 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-16 01:48:21 -0700 |
| commit | 630b0515ad494225c8c8532670ffd3d1e2359140 (patch) | |
| tree | 6e13c910165de92d30f08a83c23e285c31e90898 /builtin.cpp | |
| parent | b06e7983733578d783bc585e7b0fc95f401b2e8d (diff) | |
| parent | 3b25795ee5760b29cd0498f15dfb0d30f8638138 (diff) | |
Merge branch 'master' into ast
Conflicts:
parse_util.cpp
Diffstat (limited to 'builtin.cpp')
| -rw-r--r-- | builtin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin.cpp b/builtin.cpp index 6e669e69..a783828e 100644 --- a/builtin.cpp +++ b/builtin.cpp @@ -1116,7 +1116,7 @@ static void functions_def(const wcstring &name, wcstring &out) bool defer_function_name = (name.at(0) == L'-'); if (! defer_function_name) { - out.append(name); + out.append(escape_string(name, true)); } if (! desc.empty()) @@ -1190,7 +1190,7 @@ static void functions_def(const wcstring &name, wcstring &out) if (defer_function_name) { out.append(L" -- "); - out.append(name); + out.append(escape_string(name, true)); } /* This forced tab is sort of crummy - not all functions start with a tab */ @@ -1340,7 +1340,7 @@ static int builtin_functions(parser_t &parser, wchar_t **argv) { int i; for (i=woptind; i<argc; i++) - function_remove(argv[i]); + function_remove_ignore_autoload(argv[i]); return STATUS_BUILTIN_OK; } else if (desc) |