From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-32203-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 8340 invoked by alias); 30 Dec 2013 19:18:01 -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: 32203
Received: (qmail 20875 invoked from network); 30 Dec 2013 19:17:46 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE
	autolearn=ham version=3.3.2
From: Bart Schaefer <schaefer@brasslantern.com>
Message-id: <131230111716.ZM23440@torch.brasslantern.com>
Date: Mon, 30 Dec 2013 11:17:16 -0800
In-reply-to: <52C1884C.4050101@aon.at>
Comments: In reply to Martin Birgmeier <Martin.Birgmeier@aon.at>
 "zsh-5.0.4: cd autocompletion broken for "../" when CDPATH is set" (Dec 30,
 3:50pm)
References: <52C1884C.4050101@aon.at>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: zsh-workers@zsh.org
Subject: Re: zsh-5.0.4: cd autocompletion broken for "../" when CDPATH is set
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii

On Dec 30,  3:50pm, Martin Birgmeier wrote:
}
} Since the upgrade to 5.0.4, whenever I type (in any directory)
} 
} # cd ../<TAB>
} 
} then instead of autocompleting the entries in .., I get all entries in
} all of the CDPATH components.

My apologies.

diff --git a/Completion/Zsh/Command/_cd b/Completion/Zsh/Command/_cd
index b9860ff..0b48842 100644
--- a/Completion/Zsh/Command/_cd
+++ b/Completion/Zsh/Command/_cd
@@ -63,7 +63,7 @@ else
     fi
   fi
 
-  if [[ $PREFIX != (\~|/|./|../)* ]]; then
+  if [[ $PREFIX != (\~|/|./|../)* && -z $tmpWpath ]]; then
     local tmpcdpath alt
 
     alt=()