mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-06-22 14:49:23 +02:00
Code

make sure caller-supplied explanation takes precedence (10579)

This commit is contained in:
Sven Wischnowsky 2000-04-07 12:43:31 +00:00
parent 424ad9fc1d
commit d779b43f42
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,9 @@
2000-04-07 Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
* 10579: Completion/Base/_arguments, Completion/Base/_values,
Completion/Core/_alternative: make sure caller-supplied
explanation takes precedence
* 10575: Completion/User/_make: complete make targets of the form
`foo bar:'
@ -11,10 +15,13 @@
multiple directories didn't work
2000-04-06 Clint Adams <schizo@debian.org>
* Felix Rosencrantz: 10564: Completion/X/_x_display:
typo in _wanted.
* 10565: acconfig.h, configure.in, Src/exec.c:
add configure option for function depth limit.
* 10566: Src/glob.c: change invocation of patgetglobflags
to use two arguments.

5
Completion/Base/_arguments
View File

@ -258,8 +258,9 @@ if (( $# )) && comparguments -i "$autod" "$@"; then
# Otherwise we call it with the description-arguments.
eval "action=( $action )"
_all_labels arguments expl "$descr" \
"$action[1]" "$subopts[@]" "${(@)action[2,-1]}"
while _next_label arguments expl "$descr"; do
"$action[1]" "$subopts[@]" "$expl[@]" "${(@)action[2,-1]}"
done
fi
fi
fi

5
Completion/Base/_values
View File

@ -141,8 +141,9 @@ if compvalues -i "$@"; then
# Otherwise we call it with the description-arguments built above.
eval "action=( $action )"
_all_labels arguments expl "$descr" \
"$action[1]" "$subopts[@]" "${(@)action[2,-1]}"
while _next_label arguments expl "$descr"; do
"$action[1]" "$subopts[@]" "$expl[@]" "${(@)action[2,-1]}"
done
fi
fi

5
Completion/Core/_alternative
View File

@ -66,8 +66,9 @@ while _tags; do
# Otherwise we call it with the description-arguments built above.
eval "action=( $action )"
_all_labels "${def%%:*}" expl "$descr" \
"$action[1]" "$subopts[@]" "${(@)action[2,-1]}"
while _next_label "${def%%:*}" expl "$descr"; do
"$action[1]" "$subopts[@]" "$expl[@]" "${(@)action[2,-1]}"
done
fi
fi
done