Index: Src/Zle/zle_tricky.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_tricky.c,v
retrieving revision 1.99
diff -u -r1.99 zle_tricky.c
--- Src/Zle/zle_tricky.c 20 Feb 2009 21:49:58 -0000 1.99
+++ Src/Zle/zle_tricky.c 15 Aug 2009 16:25:16 -0000
@@ -1211,7 +1211,15 @@
(ins == 2 && i == 2) || (ins == 3 && i == 3) ||
tok == BAR || tok == AMPER ||
tok == BARAMP || tok == AMPERBANG ||
- ((tok == DBAR || tok == DAMPER) && !incond)) {
+ ((tok == DBAR || tok == DAMPER) && !incond) ||
+ /*
+ * Special case: we might reach a new command (incmdpos set)
+ * if we've already found the string we're completing (tt set)
+ * without hitting one of the above if we're using one of
+ * the special zsh forms of delimiting for conditions and
+ * loops that I really loathe having to support.