X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/c10abd8adcc70058a2389ee7fe24748496d6ecfc..62fc28127af60bc3c76d210b99bc927e131ba1f6:/muttjump

diff --git a/muttjump b/muttjump
index e2f04ec..8170f4e 100755
--- a/muttjump
+++ b/muttjump
@@ -58,6 +58,11 @@ function quote () {
     echo \'${1//\'/\'\\\'\'}\'
 }
 
+function is_callable () {
+    read cmd args <<<$1
+    type -p $cmd >/dev/null
+}
+
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
@@ -71,7 +76,7 @@ END
 fi
 
 # check if mutt is installed
-if ! type -p $MUTT >/dev/null ; then
+if ! is_callable $MUTT ; then
     die "$MUTT is not in PATH, set MUTT variable"
 fi
 
@@ -84,9 +89,9 @@ case $MUTTJUMP_MODE in
 esac
 
 # search for Message-ID in STDIN
-if type -p $FORMAIL >/dev/null ; then
+if is_callable $FORMAIL ; then
     msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
-elif type -p $REFORMAIL >/dev/null ; then
+elif is_callable $REFORMAIL ; then
     msgid=$($REFORMAIL -c -x Message-ID: | head -n1)
 else
     msgid=$(sed -n 's/^Message-ID:[ \t]*\(.*\)/\1/Ip' | head -n1)
@@ -137,7 +142,10 @@ jump_expr="~i'$msgid'"
 
 if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
-    jump_cmd="<$MUTTJUMP_MODE>$jump_expr<enter>"
+    jump_cmd="<limit>$jump_expr<enter>"
+    if [ "$MUTTJUMP_MODE" = search ] ; then
+        jump_cmd="$jump_cmd<limit>all<enter>"
+    fi
 
     # Close message-stdin and open terminal-stdin instead.
     # mutt behaves different if STDIN is no terminal
@@ -151,14 +159,10 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
 else
 
-    case $MUTTJUMP_MODE in
-        limit)
-            jump_cmd="l$jump_expr"
-            ;;
-        search)
-            jump_cmd="/$jump_expr"
-            ;;
-    esac
+    jump_cmd="l$jump_expr
"
+    if [ "$MUTTJUMP_MODE" = search ] ; then
+        jump_cmd="${jump_cmd}lall
"
+    fi
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
     declare -a screen_opts
@@ -167,7 +171,7 @@ else
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 
-    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd
\""
+    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
 
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with: