zsh-workers
 help / color / mirror / code / Atom feed
From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh workers <zsh-workers@zsh.org>
Subject: Re: Completion of prefix redirections is -command- instead of -redirect-
Date: Wed, 26 Aug 2015 21:35:32 -0700	[thread overview]
Message-ID: <150826213532.ZM31157@torch.brasslantern.com> (raw)
In-Reply-To: <CAHYJk3S-T6kyx5v7ARo8MP8O7D57ig=eKoXyi2Cr4b+=3W0B3A@mail.gmail.com>

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)


  reply	other threads:[~2015-08-27  4:35 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-26  5:39 Daniel Shahaf
2015-08-26 18:18 ` Bart Schaefer
2015-08-27  0:16   ` Mikael Magnusson
2015-08-27  4:35     ` Bart Schaefer [this message]
2015-08-27  4:47       ` Bart Schaefer
2015-08-27  4:54         ` Mikael Magnusson
2015-08-27  5:14           ` Bart Schaefer
2015-08-27  6:22             ` Mikael Magnusson
2015-08-27 16:47               ` Bart Schaefer
2015-08-27 18:54                 ` Mikael Magnusson
2015-08-27 19:00                   ` Mikael Magnusson
2015-08-27 23:20                   ` Bart Schaefer
2015-08-27  8:42             ` Peter Stephenson

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=150826213532.ZM31157@torch.brasslantern.com \
    --to=schaefer@brasslantern.com \
    --cc=zsh-workers@zsh.org \
    /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).