info, man, rsync: Defer _expand invocation

scop · Mar 17, 2018 · add4e3c · add4e3c
1 parent 6365265
commit add4e3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/completions/info b/completions/info
@@ -5,8 +5,6 @@ _info()
     local cur prev words cword split
     _init_completion -s || return
 
-    _expand || return
-
     # default completion if parameter looks like a path
     if [[ "$cur" == @(*/|[.~])* ]]; then
         _filedir
@@ -49,6 +47,8 @@ _info()
         infopath=$INFOPATH
     fi
 
+    _expand || return
+
     infopath=$infopath:
     if [[ -n $cur ]]; then
         infopath="${infopath//://$cur* }"

diff --git a/completions/man b/completions/man
@@ -45,8 +45,6 @@ _man()
         return
     fi
 
-    _expand || return
-
     # file based completion if parameter looks like a path
     if [[ "$cur" == @(*/|[.~])* ]]; then
         _filedir "$manext"
@@ -60,6 +58,8 @@ _man()
     local sect
     [[ "$prev" == $mansect ]] && sect=$prev || sect='*'
 
+    _expand || return
+
     manpath=$manpath:
     if [[ -n $cur ]]; then
         manpath="${manpath//://*man$sect/$cur* } ${manpath//://*cat$sect/$cur* }"

diff --git a/completions/rsync b/completions/rsync
@@ -5,8 +5,6 @@ _rsync()
     local cur prev words cword split
     _init_completion -s -n : || return
 
-    _expand || return
-
     case $prev in
         --config|--password-file|--include-from|--exclude-from|--files-from|\
         --log-file|--write-batch|--only-write-batch|--read-batch)
@@ -34,6 +32,8 @@ _rsync()
 
     $split && return
 
+    _expand || return
+
     case $cur in
         -*)
             COMPREPLY=( $( compgen -W '--verbose --quiet --no-motd --checksum