diff options
author | Tanaka Akira <akr@users.sourceforge.net> | 1999-04-15 18:12:56 +0000 |
---|---|---|
committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-04-15 18:12:56 +0000 |
commit | 7a40d6c258ad87d147ee5d6839e746c33ebc0ac7 (patch) | |
tree | f1330b87515dca18f200b2ea435842de26ada0e9 /Src/Zle/zle_thingy.c | |
parent | 20d67907c95265356b51dbdce8ecc0c1ede9e66b (diff) | |
download | zsh-7a40d6c258ad87d147ee5d6839e746c33ebc0ac7.tar.gz zsh-7a40d6c258ad87d147ee5d6839e746c33ebc0ac7.tar.xz zsh-7a40d6c258ad87d147ee5d6839e746c33ebc0ac7.zip |
zsh-3.1.5-pws-6 zsh-3.1.5-pws-6
Diffstat (limited to 'Src/Zle/zle_thingy.c')
-rw-r--r-- | Src/Zle/zle_thingy.c | 57 |
1 files changed, 5 insertions, 52 deletions
diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c index 2e21b5add..629d5a84e 100644 --- a/Src/Zle/zle_thingy.c +++ b/Src/Zle/zle_thingy.c @@ -244,9 +244,7 @@ unbindwidget(Thingy t, int override) static void freewidget(Widget w) { - if ((w->flags & WIDGET_COMP) && w->u.cc) - freecompctl(w->u.cc); - else if (w->flags & WIDGET_NCOMP) { + if (w->flags & WIDGET_NCOMP) { zsfree(w->u.comp.wid); zsfree(w->u.comp.func); } else if(!(w->flags & WIDGET_INT)) @@ -339,7 +337,7 @@ bin_zle(char *name, char **args, char *ops, int func) { 'D', bin_zle_del, 1, -1 }, { 'A', bin_zle_link, 2, 2 }, { 'N', bin_zle_new, 1, 2 }, - { 'C', bin_zle_compctl, 1, -1}, + { 'C', bin_zle_complete, 3, 3 }, { 'c', bin_zle_complete, 3, 3 }, { 0, bin_zle_call, 0, -1 }, }; @@ -392,14 +390,11 @@ scanlistwidgets(HashNode hn, int list) if(w->flags & WIDGET_INT) return; if(list) { - fputs((w->flags & WIDGET_COMP) ? "zle -C " : "zle -N ", stdout); + fputs("zle -N ", stdout); if(t->nam[0] == '-') fputs("-- ", stdout); quotedzputs(t->nam, stdout); - if (w->flags & WIDGET_COMP) { - if (printcompctlptr && w->u.cc) - printcompctlptr(NULL, w->u.cc, PRINT_LIST, 0); - } else if (w->flags & WIDGET_NCOMP) { + if (w->flags & WIDGET_NCOMP) { fputc(' ', stdout); quotedzputs(w->u.comp.wid, stdout); fputc(' ', stdout); @@ -410,11 +405,7 @@ scanlistwidgets(HashNode hn, int list) } } else { nicezputs(t->nam, stdout); - if (w->flags & WIDGET_COMP) { - fputs(" -C", stdout); - if (printcompctlptr && w->u.cc) - printcompctlptr(NULL, w->u.cc, PRINT_TYPE, 0); - } else if (w->flags & WIDGET_NCOMP) { + if (w->flags & WIDGET_NCOMP) { fputs(" -c ", stdout); nicezputs(w->u.comp.wid, stdout); fputc(' ', stdout); @@ -482,44 +473,6 @@ bin_zle_new(char *name, char **args, char *ops, char func) /**/ static int -bin_zle_compctl(char *name, char **args, char *ops, char func) -{ - Compctl cc = NULL; - Widget w; - char *wname = args[0]; - - if (!compctl_widgetptr) { - zwarnnam(name, "compctl module is not loaded", NULL, 0); - return 1; - } - - args++; - - if (*args && !(cc = compctl_widgetptr(name, args))) - return 1; - - w = zalloc(sizeof(*w)); - w->flags = WIDGET_COMP|ZLE_MENUCMP|ZLE_KEEPSUFFIX; - w->first = NULL; - w->u.cc = cc; - if(bindwidget(w, rthingy(wname))) { - freewidget(w); - zerrnam(name, "widget name `%s' is protected", wname, 0); - return 1; - } - if (ops['m']) - w->flags |= ZLE_USEMENU; - else if (ops['M']) - w->flags |= ZLE_NOMENU; - if (ops['g']) - w->flags |= ZLE_USEGLOB; - else if (ops['G']) - w->flags |= ZLE_NOGLOB; - return 0; -} - -/**/ -static int bin_zle_complete(char *name, char **args, char *ops, char func) { Thingy t; |