about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <okiddle@yahoo.co.uk>2018-08-28 17:41:29 +0200
committerOliver Kiddle <okiddle@yahoo.co.uk>2018-08-28 17:41:29 +0200
commit419625bf879c70869552e614e05d84f47c792bdf (patch)
treeb3f0c5f43039d89c3865a3aa9c64e0d2c5a1f145
parente104d0a6fe7b17c72d74b43fd45e03387f0535e2 (diff)
downloadzsh-419625bf879c70869552e614e05d84f47c792bdf.tar.gz
zsh-419625bf879c70869552e614e05d84f47c792bdf.tar.xz
zsh-419625bf879c70869552e614e05d84f47c792bdf.zip
43345: don't modify global variable in _umountable
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_mount2
-rw-r--r--Completion/Unix/Type/_umountable2
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f24bd619..49c970e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-08-28  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
+	* 43345: Completion/Unix/Command/_mount,
+	Completion/Unix/Type/_umountable: don't modify global variable
+
 	* unposted: Completion/Linux/Command/_dkms: correct
 	completion argument order
 
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'