X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/6fde4fdd7fa12b76a3a4136dff96266c05088b97..64ae6e09ed6c57660c921d7f1bdd5e1aa4ad9886:/muttjump

diff --git a/muttjump b/muttjump
index a25771e..7ebc639 100755
--- a/muttjump
+++ b/muttjump
@@ -89,7 +89,7 @@ if type -p $FORMAIL >/dev/null ; then
 elif type -p $REFORMAIL >/dev/null ; then
     msgid=$($REFORMAIL -c -x Message-ID: | head -n1)
 else
-    msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
+    msgid=$(sed -n 's/^Message-ID:[ \t]*\(.*\)/\1/Ip' | head -n1)
 fi
 if [ -z "$msgid" ] ; then
     die "could not find Message-ID header in standard input"
@@ -137,13 +137,16 @@ 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
     # TODO: Find cleaner solution (e.g. mutt command-line argument?)
     exec 0<&-
-    term="/dev/$(ps -p$$ --no-heading | awk '{print $2}')"
+    term="/dev/$(ps -p$$ -otty=)"
     exec < $term
 
     # start mutt, open original folder and jump to the original message
@@ -151,14 +154,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 +166,7 @@ else
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 
-    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select ." "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: