Merge branch 'master' into ordered_args

z.sh

@@ -101,7 +101,7 @@ _z() {
     else
         # list/go
         while [ "$1" ]; do case "$1" in
-            --) while [ "$1" ]; do shift; local fnd="$fnd $1";done;;
+            --) while [ "$1" ]; do shift; local fnd="$fnd${fnd:+ }$1";done;;
             -*) local opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
                     c) local fnd="^$PWD $fnd";;
                     h) echo "${_Z_CMD:-z} [-chlrtx] args" >&2; return;;
@@ -110,7 +110,7 @@ _z() {
                     r) local typ="rank";;
                     t) local typ="recent";;
                 esac; opt=${opt:1}; done;;
-             *) local fnd="$fnd $1";;
+             *) local fnd="$fnd${fnd:+ }$1";;
         esac; local last=$1; shift; done
         [ "$fnd" -a "$fnd" != "^$PWD " ] || local list=1