1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-17 22:31:12 +01:00

use _x_display when setting $DISPLAY and fix bug in enable completion (15594)

This commit is contained in:
Oliver Kiddle 2001-10-12 10:49:19 +00:00
parent 0c71c4fa77
commit 3b9e036368
3 changed files with 75 additions and 0 deletions

View file

@ -1,5 +1,9 @@
2001-10-12 Oliver Kiddle <opk@zsh.org>
* 15594: Completion/Zsh/Context/_value,
Completion/Zsh/Command/_enable: use _x_display when setting
$DISPLAY and fix substitution mistake in enable completion
* 15983: Completion/Unix/Command/_user_admin,
Completion/Unix/Command/_sysctl, Completion/Unix/Type/_urls,
Completion/Unix/Command/_webbrowser: darwin support in _sysctl,

View file

@ -0,0 +1,8 @@
#compdef enable
_arguments -C -s -A "-*" -S \
"(-f -r)-a[act on aliases]:*:aliases:(${(k)dis_aliases})" \
"(-a -r)-f[act on functions]:*:functions:(${(k)dis_functions})" \
"(-a -f)-r[act on reserved words]:*:reserved-words:(${(k)dis_reswords})" \
'-m[treat arguments as patterns]' \
"*:builtin command:(${(k)dis_builtins})"

View file

@ -0,0 +1,63 @@
#compdef -value- -array-value-
_value () {
# You can customize completion for different parameters by writing a
# function `_value:<name>', where <name> is the name of the parameter.
# When completing values of elements of associative arrays, we first
# search for a function `_value:<assoc>-<key>' and then for
# `_value:<assoc>', so it's simple to define different functions
# for different keys or one function for a whole association.
if (( $+functions[_value:$compstate[parameter]] )); then
"_value:$compstate[parameter]" "$@"
elif (( $+functions[_value:${compstate[parameter]%%-*}] )); then
"_value:${compstate[parameter]%%-*}" "$@"
elif [[ "$compstate[parameter]" != *-* &&
"${(Pt)${compstate[parameter]}}" = assoc* ]]; then
if (( CURRENT & 1 )); then
_wanted association-keys expl 'association key' \
compadd -k "$compstate[parameter]"
else
compstate[parameter]="${compstate[parameter]}-${words[CURRENT-1]}"
_value "$@"
fi
else
local pats
if { zstyle -a ":completion:${curcontext}:" assign-list pats &&
[[ "$compstate[parameter]" = (${(j:|:)~pats}) ]] } ||
[[ "$PREFIX$SUFFIX" = *:* ]]; then
compset -P '*:'
compset -S ':*'
_default -r '\-\n\t /:' "$@"
else
_default "$@"
fi
fi
}
_value:CPPFLAGS () {
compset -q
if compset -P '-I'; then
_files -/ "$@"
else
_default "$@"
fi
}
_value:LDFLAGS () {
compset -q
if compset -P '-L'; then
_files -/ "$@"
elif compset -P '-R'; then
compset -P '*:'
compset -S ':*'
_files -/ -S/ -r '\n\t\- /:' "$@"
else
_default "$@"
fi
}
_value:DISPLAY() { _x_display "$@" }
_value "$@"