Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: Return value of _multi_parts
- X-seq: zsh-workers 9893
- From: Sven Wischnowsky <wischnow@xxxxxxxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxxxxxxxxx
- Subject: Re: Return value of _multi_parts
- Date: Mon, 28 Feb 2000 10:06:07 +0100 (MET)
- In-reply-to: "Bart Schaefer"'s message of Mon, 28 Feb 2000 04:52:35 +0000
- Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm
Bart Schaefer wrote:
> According to the documentation, _multi_parts is supposed to return 0 if
> it successfully added any matches. However, there appear to be several
> cases where it returns 0 as long as it has called compadd, i.e. without
> checking the exit status of compadd.
>
> Am I missing something, or is this incorrect?
Ugh. True.
Bye
Sven
diff -ru ../z.old/Completion/Core/_multi_parts Completion/Core/_multi_parts
--- ../z.old/Completion/Core/_multi_parts Mon Feb 28 10:02:58 2000
+++ Completion/Core/_multi_parts Mon Feb 28 10:05:22 2000
@@ -128,9 +128,10 @@
-M "r:|${sep}=* r:|=* $match" - "$tmp1[1]"
fi
fi
- return 0
+ return
fi
elif (( $#tmp1 )); then
+ local ret=1
# More than one match. First we get all strings that match the
# rest from the line.
@@ -164,10 +165,10 @@
if [[ "$i" = *${sep}* ]]; then
compadd "$group[@]" "$expl[@]" -r "$sep" -S "$sep" "$opts[@]" \
-p "$pref" \
- -M "r:|${sep}=* r:|=* $match" - "${i%%${sep}*}"
+ -M "r:|${sep}=* r:|=* $match" - "${i%%${sep}*}" && ret=0
else
compadd "$group[@]" "$expl[@]" -S '' "$opts[@]" -p "$pref" \
- -M "r:|${sep}=* r:|=* $match" - "$i"
+ -M "r:|${sep}=* r:|=* $match" - "$i" && ret=0
fi
done
else
@@ -179,14 +180,14 @@
if [[ "$i" = *${sep}* ]]; then
compadd "$group[@]" "$expl[@]" -r "$sep" -S "$sep" "$opts[@]" \
-p "$pref" -s "${i#*${sep}}" \
- -M "r:|${sep}=* r:|=* $match" - "${i%%${sep}*}"
+ -M "r:|${sep}=* r:|=* $match" - "${i%%${sep}*}" && ret=0
else
compadd "$group[@]" "$expl[@]" -S '' "$opts[@]" -p "$pref" \
- -M "r:|${sep}=* r:|=* $match" - "$i"
+ -M "r:|${sep}=* r:|=* $match" - "$i" && ret=0
fi
done
fi
- return 0
+ return ret
else
# We are here if no string matched what's on the line. In this
# case we insert the expanded prefix we collected if it differs
@@ -205,7 +206,7 @@
compadd "$group[@]" "$expl[@]" -S '' "$opts[@]" \
-M "r:|${sep}=* r:|=* $match" - "$pref$pre"
fi
- return 0
+ return
fi
fi
--
Sven Wischnowsky wischnow@xxxxxxxxxxxxxxxxxxxxxxx
Messages sorted by:
Reverse Date,
Date,
Thread,
Author