From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-20244-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 28812 invoked from network); 8 Aug 2004 16:53:51 -0000
Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88)
  by ns1.primenet.com.au with SMTP; 8 Aug 2004 16:53:51 -0000
Received: (qmail 45999 invoked from network); 8 Aug 2004 16:53:45 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 8 Aug 2004 16:53:45 -0000
Received: (qmail 15369 invoked by alias); 8 Aug 2004 16:53:36 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 20244
Received: (qmail 15358 invoked from network); 8 Aug 2004 16:53:36 -0000
Received: from unknown (HELO a.mx.sunsite.dk) (130.225.247.88)
  by 130.225.247.90 with SMTP; 8 Aug 2004 16:53:36 -0000
Received: (qmail 44527 invoked from network); 8 Aug 2004 16:51:38 -0000
Received: from unknown (HELO moonbase.zanshin.com) (167.160.213.139)
  by a.mx.sunsite.dk with SMTP; 8 Aug 2004 16:51:36 -0000
Received: from toltec.zanshin.com (toltec.zanshin.com [64.84.47.166])
	by moonbase.zanshin.com (8.12.11/8.12.11) with ESMTP id i78GpZrc017777
	for <zsh-workers@sunsite.dk>; Sun, 8 Aug 2004 09:51:35 -0700
Date: Sun, 8 Aug 2004 09:51:35 -0700 (PDT)
From: Bart Schaefer <schaefer@brasslantern.com>
Reply-To: zsh-workers@sunsite.dk
To: zsh-workers@sunsite.dk
Subject: Re: PATCH: Bug in "zed" with autoloaded functions
In-Reply-To: <Pine.LNX.4.61.0408080903110.16667@toltec.zanshin.com>
Message-ID: <Pine.LNX.4.61.0408080946260.16667@toltec.zanshin.com>
References: <Pine.LNX.4.61.0408080903110.16667@toltec.zanshin.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk
X-Spam-Level: 
X-Spam-Status: No, hits=-1.4 required=6.0 tests=BAYES_20 autolearn=no 
	version=2.63
X-Spam-Hits: -1.4

On Sun, 8 Aug 2004, Bart Schaefer wrote:

> Index: Functions/Misc/zed
> ===================================================================
>    if [[ $var = *\#\ undefined* ]] then
>        autoload +X $1
> +      var="$(functions $1)"

Actually I don't like this.  It used to be the case that, if one aborted
zed -f of an autoloaded function, the function remained undefined.  The
new behavior loads the function unconditionally.

So I propose this instead:

Index: Functions/Misc/zed
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Misc/zed,v
retrieving revision 1.8
diff -u -r1.8 zed
--- Functions/Misc/zed	23 Jun 2004 16:14:27 -0000	1.8
+++ Functions/Misc/zed	8 Aug 2004 16:49:06 -0000
@@ -74,7 +74,7 @@
   var="$(functions $1)"
   # If function is undefined but autoloadable, load it
   if [[ $var = *\#\ undefined* ]] then
-      autoload +X $1
+      var="$(autoload +X $1; functions $1)"
   elif [[ -z $var ]] then
     var="$1() {
 }"