#
# macro generic ,j "<enter-command>push <pipe-message>muttjump<enter><enter>" "jump to original message"
-# one of: mairix, mu, mu-old (mu < 0.7) and nmzmail
+# one of: mairix, mairix-git, mu, mu-old (mu < 0.7) and nmzmail
MUTTJUMP_INDEXER=${MUTTJUMP_INDEXER:-}
# "limit" or "search" (default)
fi
# Version of GNU screen
-# Since 4.01.00devel (commit d87a0d8) backslash handling was altered.
+# Since 4.01.00devel (commit 98b6b41) backslash handling for -X was altered.
MUTTJUMP_SCREEN_VERSION=${MUTTJUMP_SCREEN_VERSION:-auto}
# program paths
awk '{ y = length(); if (y > x) x = y } END { print x }'
}
+# Check if screen is new enough to parse -X (commit 98b6b41) and support
+# -Q (commit 8147d08). It (falsely) assumes that screen version > 4.00
+# does this. Distributions that use git versions are likely to also keep
+# them up to date.
function is_new_screen () {
sv=$MUTTJUMP_SCREEN_VERSION
if [ "$sv" = auto ] ; then
# try to locate path of message using a mail search engine
case $MUTTJUMP_INDEXER in
+ mairix-git)
+ orig_msgfiles=$($MAIRIX -r "m:$msgid_clean")
+ ;;
mairix)
msgid_mairix=$msgid_clean
# mairix can't quote special characters (~,/=^) in search words. As a
fi
screen_opts=()
+screen_query_arg=""
if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
if [ -n "$STY" ] ; then
screen_opts=("-X" "screen")
if is_new_screen ; then
jump_cmd=${jump_cmd/\\/\\\\\\}
+ screen_query_arg="-Q"
fi
else
reopen_tty
fi
if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = yes -a -n "$STY" ] ; then
- if is_new_screen ; then
- $SCREEN -X -p "$screen_window_name" -Q select "$screen_window_name" >/dev/null
- fi
+ $SCREEN -X -p "$screen_window_name" $screen_query_arg \
+ select "$screen_window_name" >/dev/null
if [ $? = 0 ] ; then
$SCREEN -X -p "$screen_window_name" stuff ":push \"$jump_cmd\"\r"
exit 0