From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-43345-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 23530 invoked by alias); 28 Aug 2018 15:17:33 -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>
List-Unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
X-Seq: 43345
Received: (qmail 29499 invoked by uid 1010); 28 Aug 2018 15:17:33 -0000
X-Qmail-Scanner-Diagnostics: from park01.gkg.net by f.primenet.com.au (envelope-from <SRS0=Gjc1=LL=yahoo.co.uk=okiddle@bounces.park01.gkg.net>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(205.235.26.22):SA:0(-1.7/5.0):. 
 Processed in 1.585549 secs); 28 Aug 2018 15:17:33 -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=-1.7 required=5.0 tests=BAYES_00,
	FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,
	RCVD_IN_DNSWL_NONE,SPF_PASS,T_DKIM_INVALID autolearn=no autolearn_force=no
	version=3.4.1
X-Envelope-From: SRS0=Gjc1=LL=yahoo.co.uk=okiddle@bounces.park01.gkg.net
X-Qmail-Scanner-Mime-Attachments: |
X-Qmail-Scanner-Zip-Files: |
X-Virus-Scanned: by amavisd-new at gkg.net
Authentication-Results: amavisd4.gkg.net (amavisd-new);
	dkim=pass (2048-bit key) header.d=yahoo.co.uk
X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1535469430; bh=mlN3hTYnUWmWZWUr+F0wY2K/DasanfF+Qtb5LokzgiQ=; h=From:To:Subject:Date:From:Subject; b=QE3F2577PKJRZSlcBTNPNy31vdK6Tsaw2BqnnxfN8mslp8WNDkMOEVcoCo3jyD3rF7kEKgS7jstkwBx2Mxvx0rmlQm5YWBwGN0258D8mn6fDzwbhACbWjN5mTGzpEa7bL2kdghd/gOgzrh/2bNed6KruUppidBxUi8kKF2PAYQHzZIu3TBx/+ogRNWKatiPNlZjHZz9E2idSIRq6g4FlwpfgqVvyy76cVnntA3AAbtjW4spmlvljN12QlsPxYWizD3H88KKNRLjqJ0vkRP4xFtmn21KE//OYEMrNmVSXpjcrK/2jt4PivRutoa9+F9NPphob1MyeVr0iCysWUBbhmg==
X-YMail-OSG: G_mqfy0VM1l2Tdbk3cq7bg1Xlsvd5zYERKmtYMgeFO722BDUhfPPcPqPMDToMT9
 6sVXiEDcHbd4fZUYPu_Qh9kqsm4DnXq7yhdZqI4jT_p30iNd8yAkLgsbvKN_nYZEoPmuRkTyn8QO
 3oKhpAadOen.CCPU2aEPlPEM0JrmBfWeCJ4Oa9rfo.BZjNDFoPlxzzo_gdfDa9M3yzGFLXn0IGoL
 k31VdtyGk.8eebDV8tU8IteheBwi0Id1pLhYTCXZKl56_yQgNqhNZgU7PtqNEfeMKBiLELE_IO26
 hVIMvOpcZNAuCQxBIoeQAt1..BR92oiJu0XJBO0asY6y8vWpec46tYvmsBDedQ3s7pvebKmoXW_q
 UIEtXcB5SdrozeIYd8vZ6hWhpJmGzxW24fFCSpDXslGiNZiT.sPo8UYoEPRtjMQoKH66B.UFfpyK
 5LT2zFcZhQRCg.t5SlDh.6OWA_QgLCeSn9f3HwwOP1pzKfwuxz_Pg4UPpGCkWpXpsSDClRCKChw4
 2o3OWbGGyYRtCDiN.QEIxYdHcsVDJoC.rRQpzZIdCgL1sQ2E62SC7N7C2BdF3lO2_M2A0Qld6qfe
 hrND4pyPGvCFfPD4T_0LgfHhx74Thv7inTdaJw3u4R6Q2TVFGDehT6pvMQCGktjYq0TlMenlYBgS
 zPvDF_mH0rR1y9piGL2MRBwA63t_g_dIuXVMxB5g0ZfgpWLfVovP2fvpoJZYXAyM6VZX.llAuZA2
 EDJWSjbEU7_Nz7UbkGnF2FDmk.2HBhyc40ljb32BjktkEDx.jgEX.BmHGjaaULjHM1UNi4ZkLBkY
 z4rTzHLUKLqbDnRfZb1W.CRG.azqi0luN8p_v5rM24KMfFQC2G9gPGli2R3_b_OW.9h40ru9Edza
 ktGECfFx6fR.Bao6YBo5sMi.81DB035VdfWaEWszD5S6.AXX0Qo7htt_4cKG08E_dlzrhLnbmhfp
 xXXQaLJyW47XqUub_ZcFdcIj7.gklPj5PKNCA
From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: don't overwrite global in _umountable
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <18778.1535468824.1@hydra>
Date: Tue, 28 Aug 2018 17:07:04 +0200
Message-ID: <18779-1535468824.665791@LtwE.92vP.P0MS>

When _umountable was factored out of _mount, the ret=0 assignment was
carried with it. This doesn't really affect anything but I prefer to
keep the assignment in the function that has declared it local.

Oliver

diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 03cc01f8d..301b9e58e 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -931,7 +931,7 @@ devordir)
   esac
   ;;
 udevordir)
-  _umountable
+  _umountable && ret=0
   ;;
 labels)
   _wanted labels expl 'disk label' compadd /dev/disk/by-label/*(:t) && ret=0
diff --git a/Completion/Unix/Type/_umountable b/Completion/Unix/Type/_umountable
index 2b2567478..7ffce5bb4 100644
--- a/Completion/Unix/Type/_umountable
+++ b/Completion/Unix/Type/_umountable
@@ -41,4 +41,4 @@ dev_tmp=( "${(@)dev_tmp:#/*}" )
 _alternative \
   'device-labels:device label:compadd -a dev_tmp' \
   'device-paths: device path:_canonical_paths -A dpath_tmp -N -M "r:|/=* r:|=*" device-paths device\ path' \
-  'directories:mount point:_canonical_paths -A mp_tmp -N -M "r:|/=* r:|=*" directories mount\ point' && ret=0
+  'directories:mount point:_canonical_paths -A mp_tmp -N -M "r:|/=* r:|=*" directories mount\ point'