From: Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
To: zsh-workers@sunsite.auc.dk
Subject: Re: Return value of _multi_parts
Date: Mon, 28 Feb 2000 10:06:07 +0100 (MET) [thread overview]
Message-ID: <200002280906.KAA02152@beta.informatik.hu-berlin.de> (raw)
In-Reply-To: "Bart Schaefer"'s message of Mon, 28 Feb 2000 04:52:35 +0000
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@informatik.hu-berlin.de
next reply other threads:[~2000-02-28 9:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-02-28 9:06 Sven Wischnowsky [this message]
-- strict thread matches above, loose matches on Subject: below --
2000-02-28 4:52 Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200002280906.KAA02152@beta.informatik.hu-berlin.de \
--to=wischnow@informatik.hu-berlin.de \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).