From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-36285-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 9153 invoked by alias); 27 Aug 2015 04:35:42 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 36285
Received: (qmail 957 invoked from network); 27 Aug 2015 04:35:39 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	autolearn_force=no version=3.4.0
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:from:message-id:date:in-reply-to:comments
         :references:to:subject:mime-version:content-type;
        bh=tCTnBm3LnDzRBjTtFojuw+632N6BfRebCgy4/CHVvwo=;
        b=AWVKq1w1wxqD+kkcQZzPVgniAPyc/iw9bJNIddJV7XIwhNywqzZyqyrpu9og1CcvN4
         BX9S20W80kDfXTxAqY6gaK+KwA8LUeiVizfIo1iblURU1Ql+yqLEQRaGJKQ2q6e39UYk
         Na5b0RZB24JRmPJFfeqGOVCYSZcWEzTK5oaeDsrmFd2lW27bxanOHAAQ9R6QRuh/O85J
         nMaHrnntkrSeiR68ZG3LEqP7KrNbN28KeX1xN80p+Xx07+noc9UVHCbj/HINYL7K+q0K
         p3xQ6a6A1tzDQwJNeiYHlLFWlu6Zal3dCZigFFMUVBdQARWRpwcq+YEdlfnYo0n71LGs
         jG7g==
X-Gm-Message-State: ALoCoQmCRpbl/doXDWG2FAxaKhKqXANuhvFQXdgVwAMR1quW8qEh9WnVEDHQ9vq9cmiuWxUgYB/L
X-Received: by 10.182.114.233 with SMTP id jj9mr1581359obb.22.1440650135043;
        Wed, 26 Aug 2015 21:35:35 -0700 (PDT)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-Id: <150826213532.ZM31157@torch.brasslantern.com>
Date: Wed, 26 Aug 2015 21:35:32 -0700
In-Reply-To: <CAHYJk3S-T6kyx5v7ARo8MP8O7D57ig=eKoXyi2Cr4b+=3W0B3A@mail.gmail.com>
Comments: In reply to Mikael Magnusson <mikachu@gmail.com>
        "Re: Completion of prefix redirections is -command- instead of -redirect-" (Aug 27,  2:16am)
References: <20150826053928.GD19027@tarsus.local2> 
	<150826111808.ZM30185@torch.brasslantern.com> 
	<CAHYJk3S-T6kyx5v7ARo8MP8O7D57ig=eKoXyi2Cr4b+=3W0B3A@mail.gmail.com>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: zsh workers <zsh-workers@zsh.org>
Subject: Re: Completion of prefix redirections is -command- instead of -redirect-
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

On Aug 27,  2:16am, Mikael Magnusson wrote:
}
} commit 249999cfb485914fe6f8630b1f4079e1227a5097
} Author: Peter Stephenson <p.w.stephenson@ntlworld.com>
} Date:   Sun Aug 9 18:40:54 2015 +0100
} 
}     36025: Fix completion aftoer "foo=bar; setopt ".
} 
}     Done by catching a case that doesn't seem to be handled otherwise,
}     so there's some hope it doesn't screw up too much.
} 
} With the above commit reverted, < <tab> completes files again, but so
} does ; <tab>.

Does this do it?


diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index b87b99b..cb17bde 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1184,11 +1184,12 @@ get_comp_string(void)
 	 * considering a new command.  Consequently, although this looks
 	 * relatively harmless by itself, it's probably incomplete.
 	 */
-	lincmd = (incmdpos && !ins && !incond) ||
-	    (oins == 2 && wordpos == 2) ||
-	    (ins == 3 && wordpos == 1) ||
-	    (cmdtok == NULLTOK && !incond);
 	linredir = (inredir && !ins);
+	lincmd = !linredir &&
+	    ((incmdpos && !ins && !incond) ||
+	     (oins == 2 && wordpos == 2) ||
+	     (ins == 3 && wordpos == 1) ||
+	     (cmdtok == NULLTOK && !incond));
 	oins = ins;
 	/* Get the next token. */
 	if (linarr)