Merge branch 'master' into screen-git

diff --combined muttjump
index 60da9408d1c5d49d1923251cb16d78f1dd2d287e,5c7e15f122b25599540caba5f302796ec7becc44..ab438007b46c3967ab6a9cff4a2f84d714e6bb4f
--- 1/muttjump
--- 2/muttjump
+++ b/muttjump
@@@ -170,13 -170,24 +170,24 @@@ f
  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)) \
          $count $choices 3>&2 2>&1 1>&3-)
+ elif [ $count -gt 1 ] ; then
+     choices=()
+     while read line ; do
+         choices=("${choices[@]}" "$(dirname "$(dirname "$line")")")
+     done <<<"$orig_msgfiles"
+     echo "More than one mailbox found"
+     echo "Select mailbox:"
+     select md in "${choices[@]}" ; do
+         orig_maildir=$md
+         break
+     done <> /dev/tty
  else
-     orig_msgfile=$(echo "$orig_msgfiles" | head -n1)
+     orig_msgfile=$orig_msgfiles
      # get containing maildir of $orig_msgfile
      orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
  fi
@@@ -186,13 -197,14 +197,13 @@@ if [ ! -d "$orig_maildir/cur" ] ; the
  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
@@@ -216,22 -228,12 +227,22 @@@
  
  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