Merge branch 'master' into screen-git

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 38e8a02505bd04e16c88c684ac8d0f742c32f8ae..2127243327b016607fd6a14d2405c999809b4949 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -154,7 +154,7 @@ case $MUTTJUMP_INDEXER in
         # workaround, split Message-ID in 31-character long AND-linked
         # substrings.
         msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/ /g' \
-            -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ \+$/=/g' \
+            -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ *$/=/g' \
             -e 's/ /=,/g')
         orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
         ;;
@@ -213,14 +213,13 @@ fi
 
 msgid_mutt=$(quote_regexp "$msgid_quoted")
 jump_expr="~i'$msgid_mutt'"
+jump_cmd="<limit>$jump_expr<enter>"
+if [ "$MUTTJUMP_MODE" = search ] ; then
+    jump_cmd="$jump_cmd<limit>all<enter>"
+fi
 
 if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
-    jump_cmd="<limit>$jump_expr<enter>"
-    if [ "$MUTTJUMP_MODE" = search ] ; then
-        jump_cmd="$jump_cmd<limit>all<enter>"
-    fi
-
     if [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
         MUTTJUMP_USE_SCREEN=yes
     fi
@@ -244,12 +243,22 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
 else
 
-    jump_cmd="l$jump_expr\r"
+    jump_cmd_short="l$jump_expr\r"
     if [ "$MUTTJUMP_MODE" = search ] ; then
-        jump_cmd="${jump_cmd}lall\r"
+        jump_cmd_short="${jump_cmd_short}lall\r"
     fi
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
 
-    $SCREEN -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
+    if [ -z "$STY" ] ; then
+        reopen_tty
+        $SCREEN -t "$screen_window_name" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
+    else
+        $SCREEN -X -p "$screen_window_name" -Q select "$screen_window_name" >/dev/null
+        if [ $? != 0 ] ; then
+            $SCREEN -X screen -t "$screen_window_name" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
+        else
+            $SCREEN -X -p "$screen_window_name" stuff "$jump_cmd_short"
+        fi
+    fi
 fi