From 3f588ef05f56031de452e940b0f4b4fd5453b4ed Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Tue, 18 Feb 2003 15:53:19 +0000 Subject: merge changes from 4.1 --- Src/Zle/complete.mdd | 2 +- Src/builtin.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Src') diff --git a/Src/Zle/complete.mdd b/Src/Zle/complete.mdd index eea9645dc..ea9d5f5f6 100644 --- a/Src/Zle/complete.mdd +++ b/Src/Zle/complete.mdd @@ -1,7 +1,7 @@ name=zsh/complete link=either load=yes -functions='Completion/comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandrake/*/* Completion/Redhat/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*' +functions='Completion/*comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandrake/*/* Completion/Redhat/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*' moddeps="zsh/zle" diff --git a/Src/builtin.c b/Src/builtin.c index b175bcae9..8b59accf1 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -116,7 +116,7 @@ static struct builtin builtins[] = BUILTIN("unalias", 0, bin_unhash, 1, -1, 0, "m", "a"), BUILTIN("unfunction", 0, bin_unhash, 1, -1, 0, "m", "f"), BUILTIN("unhash", 0, bin_unhash, 1, -1, 0, "adfm", NULL), - BUILTIN("unset", BINF_PSPECIAL, bin_unset, 1, -1, 0, "fm", NULL), + BUILTIN("unset", BINF_PSPECIAL, bin_unset, 1, -1, 0, "fmv", NULL), BUILTIN("unsetopt", 0, bin_setopt, 0, -1, BIN_UNSETOPT, NULL, NULL), BUILTIN("wait", 0, bin_fg, 0, -1, BIN_WAIT, NULL, NULL), BUILTIN("whence", 0, bin_whence, 0, -1, 0, "acmpvfsw", NULL), -- cgit 1.4.1