From: Johannes Weißl <jargon@molb.org>
Date: Thu, 11 Nov 2010 08:04:59 +0000 (+0100)
Subject: use short-form commands in screen mode (thanks to jostber <http://github.com/jostber>)
X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/6fde4fdd7fa12b76a3a4136dff96266c05088b97?ds=sidebyside

use short-form commands in screen mode (thanks to jostber <http://github.com/jostber>)

This way less quoting is necessary and one screen command can be used.
Also the mutt history is cleaner.
---

diff --git a/muttjump b/muttjump
index dd72034..a25771e 100755
--- a/muttjump
+++ b/muttjump
@@ -133,10 +133,12 @@ if [ ! -d "$orig_maildir/cur" ] ; then
     die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
 fi
 
-jump_cmd="<$MUTTJUMP_MODE>~i '$msgid'<enter>"
+jump_expr="~i'$msgid'"
 
 if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
+    jump_cmd="<$MUTTJUMP_MODE>$jump_expr<enter>"
+
     # Close message-stdin and open terminal-stdin instead.
     # mutt behaves different if STDIN is no terminal
     # TODO: Find cleaner solution (e.g. mutt command-line argument?)
@@ -149,6 +151,15 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
 else
 
+    case $MUTTJUMP_MODE in
+        limit)
+            jump_cmd="l$jump_expr"
+            ;;
+        search)
+            jump_cmd="/$jump_expr"
+            ;;
+    esac
+
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
     declare -a screen_opts
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
@@ -156,8 +167,8 @@ else
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 
-    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X select .
-    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X stuff ":push \"$jump_cmd\"
"
+    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select ." "stuff \"$jump_cmd
\""
+
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with:
 $SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"