3 files changed, 7 insertions, 7 deletions
diff --git a/Completion/Linux/Type/_fuse_arguments b/Completion/Linux/Type/_fuse_arguments
index ea705a2d0..b5c21a5e2 100644
--- a/Completion/Linux/Type/_fuse_arguments
+++ b/Completion/Linux/Type/_fuse_arguments
@@ -18,7 +18,7 @@ long=$argv[(I)--]
 if (( long )); then
   argv[long]=($fargs --)
 else
-  set -- $@ $fargs
+  set -- "$@" $fargs
 fi
 
 while [[ $1 == -(O*|F*|[CRWsw]) ]]; do
@@ -38,10 +38,10 @@ if [[ $cvalsvar != - ]]; then
   fsopt='*-o[specify mount options]:mount option:_fuse_values'
   [[ -n $cvalsvar ]] && fsopt+=" -A $cvalsvar"
   fsopt+=' mount\ option'
-  set -- $@ $fsopt
+  set -- "$@" $fsopt
 fi
 
-_arguments -R $opts $@
+_arguments -R $opts "$@"
 
 ret=$?
 
diff --git a/Completion/Linux/Type/_fuse_values b/Completion/Linux/Type/_fuse_values
index 2600d141c..be830cb40 100644
--- a/Completion/Linux/Type/_fuse_values
+++ b/Completion/Linux/Type/_fuse_values
@@ -44,12 +44,12 @@ fvals=(
   'attr_timeout[cache timeout for attributes]:timeout (s)'
 )
 
-[[ -n $cvalsvar ]] && set -- $@ ${(P)cvalsvar}
+[[ -n $cvalsvar ]] && set -- "$@" ${(P)cvalsvar}
 
 if [[ $# -eq 0 ]]; then
   set -- 'mount options' $fvals
 else
-  set -- $@ $fvals
+  set -- "$@" $fvals
 fi
 
 if [[ -n $state ]]; then
@@ -57,7 +57,7 @@ if [[ -n $state ]]; then
   state=
 fi
 
-_values $opts $@ && ret=0
+_values $opts "$@" && ret=0
 
 if [[ -n $state ]]; then
   compstate[restore]=
diff --git a/Completion/Linux/Type/_wakeup_capable_devices b/Completion/Linux/Type/_wakeup_capable_devices
index dd79d2d0d..daad43b7a 100644
--- a/Completion/Linux/Type/_wakeup_capable_devices
+++ b/Completion/Linux/Type/_wakeup_capable_devices
@@ -10,6 +10,6 @@ while read devline; do
   desc+=$item
 done
 
-_describe -t wakeup-capable-devices 'wakeup capable device' desc $@ && ret=0
+_describe -t wakeup-capable-devices 'wakeup capable device' desc "$@" && ret=0
 
 return ret