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

PATCH: don't overwrite global in _umountable



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