From: Johannes Weißl Date: Mon, 6 Dec 2010 07:04:20 +0000 (+0100) Subject: Merge branch 'master' into screen-git X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/a03c48be160b3a403864f93ac8d4b64f683a728e?hp=06ff9e456f0959839236fe955e2efe0055a364e3 Merge branch 'master' into screen-git --- diff --git a/muttjump b/muttjump index 9cb34b1..2127243 100755 --- a/muttjump +++ b/muttjump @@ -213,14 +213,13 @@ fi msgid_mutt=$(quote_regexp "$msgid_quoted") jump_expr="~i'$msgid_mutt'" +jump_cmd="$jump_expr" +if [ "$MUTTJUMP_MODE" = search ] ; then + jump_cmd="$jump_cmdall" +fi if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then - jump_cmd="$jump_expr" - if [ "$MUTTJUMP_MODE" = search ] ; then - jump_cmd="$jump_cmdall" - 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 " + 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