X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/c018b0d9c7ca6b29cf71bcba510d7b105cd615ff..9f2de58225300e4aaeb5d09753af3cf6d67b6a8c:/muttjump

diff --git a/muttjump b/muttjump
index 3d5736c..dd72034 100755
--- a/muttjump
+++ b/muttjump
@@ -128,12 +128,12 @@ if [ -z "$orig_msgfile" -o ! -e "$orig_msgfile" ] ; then
 fi
 
 # get containing maildir of $orig_msgfile
-orig_maildir=$(dirname $(dirname "$orig_msgfile"))
+orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
 if [ ! -d "$orig_maildir/cur" ] ; then
     die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
 fi
 
-jump_cmd="<change-folder>$orig_maildir<enter><$MUTTJUMP_MODE>~i '$msgid'<enter>"
+jump_cmd="<$MUTTJUMP_MODE>~i '$msgid'<enter>"
 
 if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
@@ -145,7 +145,7 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
     exec < $term
 
     # start mutt, open original folder and jump to the original message
-    $MUTT -e "push \"$jump_cmd\""
+    $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
 
 else
 
@@ -156,8 +156,8 @@ else
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 
-    $SCREEN "${screen_opts[@]}" -X eval "select $(quote "$screen_window_name")" "stuff \":push \\\"$jump_cmd\\\"
-\""
+    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X select .
+    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X stuff ":push \"$jump_cmd\"
"
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with:
 $SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"