count=$(echo "$orig_msgfiles" | wc -l)
if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
choices=$(echo "$orig_msgfiles" | while read line ;
- do echo -e "$(dirname "$(dirname "$line")")\n." ; done)
+ do dirname "$(dirname "$line")" ; echo . ; done)
maxwidth=$(echo "$choices" | wc -L)
orig_maildir=$($DIALOG_PROG --clear --title "More than one mailbox found" \
--menu "Select mailbox:" $((count+8)) $((maxwidth+16)) \
fi
jump_expr="~i'$msgid'"
+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
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