diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Doc/Zsh/mod_zutil.yo | 11 | ||||
| -rw-r--r-- | Src/Modules/zutil.c | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 815dfb40a..fc649263d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-05-22 Sven Wischnowsky <wischnow@zsh.org> + * 11490: Doc/Zsh/mod_zutil.yo, Src/Modules/zutil.c: remove -h + option from zstyle + * 11489: Completion/Base/_arguments, Doc/Zsh/compsys.yo, Src/Zle/computil.c: pat(-) in long-option patterns to say that argument should be completed only after the `='; merge _arguments diff --git a/Doc/Zsh/mod_zutil.yo b/Doc/Zsh/mod_zutil.yo index 1a27758f8..a0e53697d 100644 --- a/Doc/Zsh/mod_zutil.yo +++ b/Doc/Zsh/mod_zutil.yo @@ -11,7 +11,7 @@ xitem(tt(zstyle) [ tt(-L) ]) xitem(tt(zstyle) [ tt(-) | tt(-)tt(-) ] var(pattern) var(style) var(strings) ...) xitem(tt(zstyle -d) [ var(pattern) [ var(styles) ... ] ]) xitem(tt(zstyle -g) var(name) [ var(pattern) [ var(style) ] ]) -xitem(tt(zstyle -abhs) var(context) var(style) var(name) [ var(sep) ]) +xitem(tt(zstyle -abs) var(context) var(style) var(name) [ var(sep) ]) xitem(tt(zstyle -Tt) var(context) var(style) [ var(strings) ...]) item(tt(zstyle -m) var(context) var(style) var(pattern))( This builtin command is used to define and lookup styles. Styles are @@ -67,11 +67,10 @@ The value is stored in var(name) as a boolean, i.e. as the string of `tt(yes)', `tt(true)', `tt(on)', or `tt(1)'. If the value is any other string or has more than one string, the parameter is set to `tt(no)'. ) -xitem(tt(zstyle -a) var(context) var(style) var(name)) -item(tt(zstyle -h) var(context) var(style) var(name))( -With the tt(-a) option the value is stored in var(name) as an array and -with tt(-h) as an associative array (with the first, third, etc. string -being used as the keys and the other strings being used as the values). +item(tt(zstyle -a) var(context) var(style) var(name))( +The value is stored in var(name) as an array. If var(name) is declared +as an associative array, the first, third, etc. stringare used as the +keys and the other strings are used as the values. ) xitem(tt(zstyle -t) var(context) var(style) [ var(strings) ...]) item(tt(zstyle -T) var(context) var(style) [ var(strings) ...])( diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c index 5524a20e5..5aab02030 100644 --- a/Src/Modules/zutil.c +++ b/Src/Modules/zutil.c @@ -279,7 +279,6 @@ bin_zstyle(char *nam, char **args, char *ops, int func) case 's': min = 3; max = 4; break; case 'b': min = 3; max = 3; break; case 'a': min = 3; max = 3; break; - case 'h': min = 3; max = 3; break; case 't': min = 2; max = -1; break; case 'T': min = 2; max = -1; break; case 'm': min = 3; max = 3; break; @@ -384,7 +383,6 @@ bin_zstyle(char *nam, char **args, char *ops, int func) } break; case 'a': - case 'h': { Stypat s; char **ret; @@ -399,10 +397,7 @@ bin_zstyle(char *nam, char **args, char *ops, int func) ret = zarrdup(&dummy); val = 1; } - if (args[0][1] == 'a') - setaparam(args[3], ret); - else - sethparam(args[3], ret); + setaparam(args[3], ret); return val; } |