X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/85ea4e44f7807d1387ce5696e8a4474f8b2f93bc..ae578a31fcc268fba07c0f0df9a4ddd61ced4e73:/muttjump

diff --git a/muttjump b/muttjump
index 3cdb6ed..2f60b3b 100755
--- a/muttjump
+++ b/muttjump
@@ -43,6 +43,10 @@ if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
     }
 fi
 
+# Version of GNU screen
+# Since 4.01.00 (commit d87a0d8) backslash handling was altered.
+MUTTJUMP_SCREEN_VERSION=${MUTTJUMP_SCREEN_VERSION:-auto}
+
 # program paths
 MUTT=${MUTT:-mutt}
 MAIRIX=${MAIRIX:-mairix}
@@ -216,14 +220,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
@@ -232,6 +235,13 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
     if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
         if [ -n "$STY" ] ; then
             screen_opts=("-X" "screen")
+            sv=$MUTTJUMP_SCREEN_VERSION
+            if [ "$sv" = auto ] ; then
+                sv=$($SCREEN --version | awk '{print $3}')
+            fi
+            if ! echo "$sv" | grep -q "^\(4\.00\|[0-3]\.\)" ; then
+                jump_cmd=${jump_cmd/\\/\\\\\\}
+            fi
         else
             reopen_tty
         fi
@@ -247,12 +257,22 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
 else
 
-    jump_cmd="l$jump_expr
"
+    jump_cmd_short="l$jump_expr
"
     if [ "$MUTTJUMP_MODE" = search ] ; then
-        jump_cmd="${jump_cmd}lall
"
+        jump_cmd_short="${jump_cmd_short}lall
"
     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