From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5193 invoked by alias); 31 Oct 2016 23:19:22 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 39796 Received: (qmail 14426 invoked from network); 31 Oct 2016 23:19:22 -0000 X-Qmail-Scanner-Diagnostics: from out2-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.26):SA:0(0.0/5.0):. Processed in 0.129451 secs); 31 Oct 2016 23:19:22 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=Q8+HOFaDLprsjSa Qq58ON7FhHY4=; b=LSlpQYIzwrVI9WxtusOWXjEw8ZpG++3pj/qNsUdl+d//BCx e7Jtl9lOpwYcWzDKopCZeKVXg+SPA2DX10MXHsNR248WvpRws/qSf2kaUbDRiJQh mClGEXb4Gf8Rb98emIiiWBRT7XmAOIqAsBi5AcCkkamaUKp4M4NXprHTq0ac= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=Q8+HOFaDLprsjS aQq58ON7FhHY4=; b=Bq7dOXrGjcqBcsG+1QKHO4+PZs6H3tFDk5Tykn+euDeqYl 1MdI6AFh3DA9LxRj6FTa9PiD5r4sTAnEOo/0oM0nPVUhlKk+Jl4tNb+mYnQK0oSb K5DbhKNJ1fNTasjJ+PiAoxfEz/jVVxENPvy7C6KaXC0CpaVNGB10V/oreTSwI= X-ME-Sender: X-Sasl-enc: p1Ktp+w9aXSUeZj7Ilzuy+jz6vjyrLosRgk95xJksV9Q 1477955959 Date: Mon, 31 Oct 2016 23:17:29 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Cc: Fourhundred Thecat <400thecat@gmx.ch> Subject: Re: [PATCH] Re: zsh completion for umount Message-ID: <20161031231729.GB7144@fujitsu.shahaf.local2> References: <5815DDAB.8070307__40712.3355348178$1477828401$gmane$org@gmx.ch> <20161030153537.GB12137@fujitsu.shahaf.local2> <58164C21.9090505@gmx.ch> <161031004732.ZM18486@torch.brasslantern.com> <161031080627.ZM20240@torch.brasslantern.com> <161031123252.ZM20846@torch.brasslantern.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <161031123252.ZM20846@torch.brasslantern.com> User-Agent: Mutt/1.5.23 (2014-03-12) Bart Schaefer wrote on Mon, Oct 31, 2016 at 12:32:52 -0700: > On Oct 31, 8:06am, Bart Schaefer wrote: > } > } The remaining problem is that _canonical_paths_pwd screws up "cd -" > > Patch below attempts to fix that. > > diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths > index 6482602..4b6b0c0 100644 > --- a/Completion/Unix/Type/_canonical_paths > +++ b/Completion/Unix/Type/_canonical_paths > @@ -16,11 +16,13 @@ > _canonical_paths_pwd() { > # Get the canonical directory name by changing to it. > integer chaselinks > + local oldpwd=$OLDPWD > [[ -o chaselinks ]] && (( chaselinks = 1 )) > - setopt localoptions nopushdignoredups chaselinks > + setopt localoptions nopushdignoredups chaselinks noautopushd > if builtin pushd -q -- $1 2>/dev/null; then > REPLY=$PWD > (( chaselinks )) || unsetopt chaselinks > + [[ -n $oldpwd && -d $oldpwd ]] && builtin cd -q $oldpwd # For "cd -" > builtin popd -q Couldn't we avoid calling pushd/cd entirely? I.e., something along the lines of if [[ -o chaselinks ]]; then REPLY=$1:A; else REPLY=$1:P; fi ? > else > REPLY=$1 >