merge stest -> default

diff --cc dmenu_run
index 976da46,e0a3e13..052e51b
--- 1/dmenu_run
--- 2/dmenu_run
+++ b/dmenu_run
@@@ -7,9 -5,8 +7,9 @@@ els
  fi
  (
        IFS=:
-       if [ "`ls -dt $PATH "$cache" | head -n 1`" != "$cache" ]; then
-               lsx $PATH | sort -u | tee "$cache" | dmenu "$@"
 -      if stest -dqr -n "$CACHE" $PATH; then
 -              stest -flx $PATH | sort -u > "$CACHE"
++      if stest -dqr -n "$cache" $PATH; then
++              stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@"
 +      else
 +              dmenu "$@" < "$cache"
        fi
 -)
 -cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"
 +) | ${SHELL:-"/bin/sh"} &