mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-22 00:21:27 +01:00
Code Releases Activity

(15526)

Browse source
This commit is contained in:
Sven Wischnowsky 2001-07-30 08:42:55 +00:00
parent 1619df1c5d
commit 75d5e9bb8b
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2001-07-30 Sven Wischnowsky <wischnow@zsh.org>
* 15526: Completion/Base/Utility/_arguments, Src/Zle/computil.c:
change order in which compgroups adds groups; add comment to
_arguments trying to explain how and why the return value is
wrong
2001-07-28 Peter Stephenson <pws@pwstephenson.fsnet.co.uk>
* 15511: Functions/Misc/zcalc, Doc/Zsh/contrib.yo: make

8
Completion/Base/Utility/_arguments
View file

@ -428,6 +428,14 @@ if (( $# )) && comparguments -i "$autod" "$singopt[@]" "$@"; then
if [[ -n "$aret" ]]; then
[[ -n $rawret ]] && return 300
### Returning non-zero would allow the calling function to add its own
### completions if we generated only options and have to use a ->state
### action. But if that then doesn't generate matches, the calling
### function's return value would be wrong unless it compares
### $compstate[nmatches] to its previous value. Ugly.
###
### return 1
else
[[ -n "$noargs" && nm -eq "$compstate[nmatches]" ]] && _message "$noargs"
fi

16
Src/Zle/computil.c
View file

@ -4281,17 +4281,17 @@ bin_compgroups(char *nam, char **args, char *ops, int func)
SWITCHHEAPS(oldheap, compheap) {
while ((n = *args++)) {
endcmgroup(NULL);
begcmgroup(n, 0);
begcmgroup(n, CGF_NOSORT|CGF_UNIQCON);
endcmgroup(NULL);
begcmgroup(n, CGF_UNIQALL);
endcmgroup(NULL);
begcmgroup(n, CGF_NOSORT|CGF_UNIQCON);
endcmgroup(NULL);
begcmgroup(n, CGF_UNIQALL);
endcmgroup(NULL);
begcmgroup(n, CGF_NOSORT);
endcmgroup(NULL);
begcmgroup(n, CGF_UNIQALL);
endcmgroup(NULL);
begcmgroup(n, CGF_NOSORT|CGF_UNIQCON);
endcmgroup(NULL);
begcmgroup(n, CGF_UNIQALL);
endcmgroup(NULL);
begcmgroup(n, CGF_NOSORT|CGF_UNIQCON);
begcmgroup(n, 0);
}
} SWITCHBACKHEAPS(oldheap);