replace search with limit <expr>, limit all

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 8ff2625d3a63462ca455c282a68077d9e5d10341..7ebc6397074e0e0561ccf1e486785b15399a38b3 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -137,13 +137,16 @@ jump_expr="~i'$msgid'"
 
 if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
 
 if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 

-    jump_cmd="<$MUTTJUMP_MODE>$jump_expr<enter>"
+    jump_cmd="<limit>$jump_expr<enter>"
+    if [ "$MUTTJUMP_MODE" = search ] ; then
+        jump_cmd="$jump_cmd<limit>all<enter>"
+    fi

 
     # 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?)
     exec 0<&-
 
     # 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?)
     exec 0<&-

-    term="/dev/$(ps -p$$ | awk 'END { print $2 }')"
+    term="/dev/$(ps -p$$ -otty=)"

     exec < $term
 
     # start mutt, open original folder and jump to the original message
     exec < $term
 
     # start mutt, open original folder and jump to the original message


@@ -151,14 +154,10 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
 else
 
 
 else
 

-    case $MUTTJUMP_MODE in
-        limit)
-            jump_cmd="l$jump_expr"
-            ;;
-        search)
-            jump_cmd="/$jump_expr"
-            ;;
-    esac
+    jump_cmd="l$jump_expr\r"
+    if [ "$MUTTJUMP_MODE" = search ] ; then
+        jump_cmd="${jump_cmd}lall\r"
+    fi

 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
     declare -a screen_opts
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
     declare -a screen_opts


@@ -167,7 +166,7 @@ else
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 

-    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\r\""
+    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""

 
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with:
 
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with: