From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-18238-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 7641 invoked from network); 13 Feb 2003 16:21:25 -0000
Received: from sunsite.dk (130.225.247.90)
  by ns1.primenet.com.au with SMTP; 13 Feb 2003 16:21:25 -0000
Received: (qmail 9287 invoked by alias); 13 Feb 2003 16:21:15 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 18238
Received: (qmail 9280 invoked from network); 13 Feb 2003 16:21:15 -0000
Received: from localhost (HELO sunsite.dk) (127.0.0.1)
  by localhost with SMTP; 13 Feb 2003 16:21:15 -0000
X-MessageWall-Score: 0 (sunsite.dk)
Received: from [193.109.254.147] by sunsite.dk (MessageWall 1.0.8) with SMTP; 13 Feb 2003 16:21:15 -0000
X-VirusChecked: Checked
X-Env-Sender: kiddleo@logica.com
X-Msg-Ref: server-2.tower-27.messagelabs.com!1045153277!3347
Received: (qmail 1475 invoked from network); 13 Feb 2003 16:21:17 -0000
Received: from iris.logica.co.uk (158.234.9.163)
  by server-2.tower-27.messagelabs.com with SMTP; 13 Feb 2003 16:21:17 -0000
Received: from finches.logica.co.uk ([158.234.142.11])
	by iris.logica.co.uk (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id QAA24059
	for <zsh-workers@sunsite.dk>; Thu, 13 Feb 2003 16:21:15 GMT
X-Authentication-Warning: iris.logica.co.uk: Host [158.234.142.11] claimed to be finches.logica.co.uk
Received: from finches.logica.co.uk (localhost [127.0.0.1])
	by finches.logica.co.uk (8.11.6/8.11.6/SuSE Linux 0.5) with ESMTP id h1DGOSU01919
	for <zsh-workers@sunsite.dk>; Thu, 13 Feb 2003 17:24:28 +0100
From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@sunsite.dk>
Subject: PATCH: install is missing bashcompinit
Date: Thu, 13 Feb 2003 17:24:28 +0100
Message-ID: <1917.1045153468@finches.logica.co.uk>
Sender: kiddleo@logica.com

With --enable-function-subdirs, bashcompinit gets missed. I think this
fix is right.

Oliver

Index: Config/installfns.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/installfns.sh,v
retrieving revision 1.9
diff -u -r1.9 installfns.sh
--- Config/installfns.sh	7 Aug 2001 09:08:50 -0000	1.9
+++ Config/installfns.sh	13 Feb 2003 16:15:46 -0000
@@ -18,13 +18,12 @@
     esac
     if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
       case "$file" in
-      Completion/comp*)
+      Completion/*/*)
         subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`"
-        instdir="$fndir/Completion"
+        instdir="$fndir/$subdir"
         ;;
       Completion/*)
-        subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`"
-        instdir="$fndir/$subdir"
+        instdir="$fndir/Completion"
         ;;
       *)
         subdir="`echo $file | sed -e 's%/[^/]*$%%' -e 's%^Functions/%%'`"
Index: Src/Zle/complete.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/complete.mdd,v
retrieving revision 1.8
diff -u -r1.8 complete.mdd
--- Src/Zle/complete.mdd	8 May 2002 09:18:13 -0000	1.8
+++ Src/Zle/complete.mdd	13 Feb 2003 16:15:46 -0000
@@ -1,7 +1,7 @@
 name=zsh/complete
 link=either
 load=yes
-functions='Completion/comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandrake/*/* Completion/Redhat/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*'
+functions='Completion/*comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandrake/*/* Completion/Redhat/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*'
 
 moddeps="zsh/zle"
 

This e-mail and any attachment is for authorised use by the intended recipient(s) only.  It may contain proprietary material, confidential information and/or be subject to legal privilege.  It should not be copied, disclosed to, retained or used by, any other party.  If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender.  Thank you.