zsh-workers
 help / color / mirror / code / Atom feed
From: "Bart Schaefer" <schaefer@brasslantern.com>
To: zsh-workers@sunsite.auc.dk, Peter Stephenson <pws@ibmth.df.unipi.it>
Subject: PATCH: Missing bits Re: zsh-3.1.5-pws-5 available
Date: Sun, 24 Jan 1999 16:41:44 -0800	[thread overview]
Message-ID: <990124164144.ZM8650@candle.brasslantern.com> (raw)
In-Reply-To: <9901231125.AA13246@ibmth.df.unipi.it>

On Jan 23, 12:25pm, Peter Stephenson wrote:
} Subject: zsh-3.1.5-pws-5 available
}
} It includes pretty much everything up to Friday, excluding Sven's last
} patch for completion after redirection.

This patch covers:

4951	Sven	Tweak completion of words following a redirection operator
4794 	Bart	Fix associative array handling in setsparam()
????	Bart	Fix the 4974 fix by adding missing parens

The ???? there refers to this article, whatever number it gets ... one part
of the patch in 4974 was included, another was not, probably because of the
missed parens that are added in the patch below.

Index: Src/Zle/zle_tricky.c
--- ../zsh-3.1.5-pws-5/Src/Zle/zle_tricky.c	Fri Jan 22 05:13:49 1999
+++ ./Src/Zle/zle_tricky.c	Sun Jan 24 10:47:22 1999
@@ -1039,7 +1039,8 @@
 		rd = linredir;
 		if (inwhat == IN_NOTHING && incond)
 		    inwhat = IN_COND;
-	    }
+	    } else if (linredir)
+		continue;
 	    if (!tokstr)
 		continue;
 	    /* Hack to allow completion after `repeat n do'. */

diff -ru ../patched/zsh-3.1.5-pws-5/Src/params.c ./Src/params.c
--- ../patched/zsh-3.1.5-pws-5/Src/params.c	Wed Jan 13 00:20:25 1999
+++ ./Src/params.c	Sun Jan 24 10:25:10 1999
@@ -1500,7 +1500,7 @@
     } else {
 	if (!(v = getvalue(&s, 1)))
 	    createparam(t, PM_SCALAR);
-	else if (PM_TYPE(v->pm->flags) == PM_ARRAY &&
+	else if ((PM_TYPE(v->pm->flags) & (PM_ARRAY|PM_HASHED)) &&
 		 !(v->pm->flags & PM_SPECIAL) && unset(KSHARRAYS)) {
 	    unsetparam(t);
 	    createparam(t, PM_SCALAR);

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com


  parent reply	other threads:[~1999-01-25  0:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
1999-01-23 11:25 Peter Stephenson
1999-01-24 12:50 ` Andrej Borsenkow
1999-01-25 10:05   ` Helmut Jarausch
1999-01-25 16:38     ` Peter Stephenson
1999-01-25  0:41 ` Bart Schaefer [this message]
1999-01-25  1:48   ` PATCH: Missing bits " 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=990124164144.ZM8650@candle.brasslantern.com \
    --to=schaefer@brasslantern.com \
    --cc=pws@ibmth.df.unipi.it \
    --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).