Merge branch 'master' into screen-git

Conflicts:
	muttjump

diff --combined muttjump
index ab438007b46c3967ab6a9cff4a2f84d714e6bb4f,cd1b0062099eae5bcf685e42f7980ecc772f8415..8ba8e0274bb4ae2bbe0f206fdbfcb13672ec8e97
--- 1/muttjump
--- 2/muttjump
+++ b/muttjump
@@@ -63,6 -63,10 +63,10 @@@ function quote () 
      echo \'${1//\'/\'\\\'\'}\'
  }
  
+ function quote_regexp () {
+     echo "$1" | sed 's/[][\^.$|)(*+?}{]/\\&/g'
+ }
+ 
  function is_callable () {
      type $1 >/dev/null 2>&1
  }
@@@ -136,12 -140,19 +140,19 @@@ f
  if [ -z "$msgid" ] ; then
      die "could not find $search_header header in standard input"
  fi
+ msgid_quoted=$(quote_regexp "$msgid")
  msgid_clean=$(echo "$msgid" | sed -e 's/^<//' -e 's/>$//')
  
  # try to locate path of message using a mail search engine
  case $MUTTJUMP_INDEXER in
      mairix)
-         orig_msgfiles=$($MAIRIX -r "m:$msgid_clean")
+         # 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')
+         orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
          ;;
      mu)
          orig_msgfiles=$($MU find -f l "i:$msgid_clean" | grep -v "^\*\*")
@@@ -151,7 -162,7 +162,7 @@@
          ;;
      nmzmail)
          nmzmail_results=$(mktemp -d)
-         echo "+message-id:$msgid" | $NMZMAIL -r "$nmzmail_results"
+         echo "+message-id:/^$msgid_quoted$/" | $NMZMAIL -r "$nmzmail_results"
          orig_msgfiles=$(find "$nmzmail_results" -type l -exec readlink {} \;)
          rm -rf "$nmzmail_results"
          ;;
@@@ -196,14 -207,16 +207,15 @@@ if [ ! -d "$orig_maildir/cur" ] ; the
      die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
  fi
  
- jump_expr="~i'$msgid'"
+ 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
@@@ -227,22 -240,12 +239,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