diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2012-09-21 19:08:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2012-09-21 19:08:35 +0000 |
| commit | dbec4fa6ccccb717608498b83989b21967948bde (patch) | |
| tree | c1aaacbe8a16ae4d1cbf8754305ce2330bd62873 /Src | |
| parent | 8e43f7f3c839429849cb36ea0c84cdc05d40ad1d (diff) | |
| download | zsh-dbec4fa6ccccb717608498b83989b21967948bde.tar.gz zsh-dbec4fa6ccccb717608498b83989b21967948bde.tar.xz zsh-dbec4fa6ccccb717608498b83989b21967948bde.zip | |
30692: allow autoload +X -m to work
change to _path_files to make it load in that fashion
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/builtin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index d8493bb8a..51ddce18c 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -46,7 +46,7 @@ static struct builtin builtins[] = BUILTIN(".", BINF_PSPECIAL, bin_dot, 1, -1, 0, NULL, NULL), BUILTIN(":", BINF_PSPECIAL, bin_true, 0, -1, 0, NULL, NULL), BUILTIN("alias", BINF_MAGICEQUALS | BINF_PLUSOPTS, bin_alias, 0, -1, 0, "Lgmrs", NULL), - BUILTIN("autoload", BINF_PLUSOPTS, bin_functions, 0, -1, 0, "ktTUwXz", "u"), + BUILTIN("autoload", BINF_PLUSOPTS, bin_functions, 0, -1, 0, "mktTUwXz", "u"), BUILTIN("bg", 0, bin_fg, 0, -1, BIN_BG, NULL, NULL), BUILTIN("break", BINF_PSPECIAL, bin_break, 0, 1, BIN_BREAK, NULL, NULL), BUILTIN("bye", 0, bin_break, 0, 1, BIN_EXIT, NULL, NULL), @@ -2882,7 +2882,7 @@ bin_functions(char *name, char **argv, Options ops, int func) if ((pprog = patcompile(*argv, PAT_STATIC, 0))) { /* with no options, just print all functions matching the glob pattern */ queue_signals(); - if (!(on|off)) { + if (!(on|off) && !OPT_ISSET(ops,'X')) { scanmatchtable(shfunctab, pprog, 1, 0, DISABLED, shfunctab->printnode, pflags); } else { |