Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: don't overwrite global in _umountable

X-seq: zsh-workers 43345
From: Oliver Kiddle <okiddle@xxxxxxxxxxx>
To: Zsh workers <zsh-workers@xxxxxxx>
Subject: PATCH: don't overwrite global in _umountable
Date: Tue, 28 Aug 2018 17:07:04 +0200
Authentication-results: amavisd4.gkg.net (amavisd-new); dkim=pass (2048-bit key) header.d=yahoo.co.uk
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==
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
List-unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm

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'

Messages sorted by: Reverse Date, Date, Thread, Author