Merge branch 'master' into screen-git

diff --combined muttjump
index 8ba8e0274bb4ae2bbe0f206fdbfcb13672ec8e97,9cb34b1fcee95786fe56a1554dc4e5a350609598..2127243327b016607fd6a14d2405c999809b4949
--- 1/muttjump
--- 2/muttjump
+++ b/muttjump
@@@ -71,6 -71,10 +71,10 @@@ function is_callable () 
      type $1 >/dev/null 2>&1
  }
  
+ function wc_L () {
+     awk '{ y = length(); if (y > x) x = y } END { print x }'
+ }
+ 
  function usage () {
      cat >&2 <<END
  Usage: muttjump msgid
@@@ -149,9 -153,9 +153,9 @@@ case $MUTTJUMP_INDEXER i
          # mairix can't quote special characters (~,/=^) in search words. As a
          # workaround, split Message-ID in 31-character long AND-linked
          # substrings.
-         msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]/=,/g' \
-             -e 's/.\{31\}/&=,/g' -e 's/^\(=,\)\+//g' -e 's/$/=/' \
-             -e 's/\(=,\|=\)\+$/=/g')
+         msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/ /g' \
+             -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ *$/=/g' \
+             -e 's/ /=,/g')
          orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
          ;;
      mu)
@@@ -182,7 -186,7 +186,7 @@@ count=$(echo "$orig_msgfiles" | wc -l
  if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
      choices=$(echo "$orig_msgfiles" | while read line ;
          do dirname "$(dirname "$line")" ; echo . ; done)
-     maxwidth=$(echo "$choices" | wc -L)
+     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-)
@@@ -209,13 -213,14 +213,13 @@@ f
  
  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
@@@ -239,22 -244,12 +243,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