From: Johannes Weißl Date: Mon, 29 Nov 2010 15:01:38 +0000 (+0100) Subject: replace search with limit , limit all X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/64ae6e09ed6c57660c921d7f1bdd5e1aa4ad9886?hp=c10abd8adcc70058a2389ee7fe24748496d6ecfc replace search with limit , limit all To make search independent from $wrap_search and $uncollapse_jump, idea by Christian Ebert . --- diff --git a/muttjump b/muttjump index e2f04ec..7ebc639 100755 --- a/muttjump +++ b/muttjump @@ -137,7 +137,10 @@ jump_expr="~i'$msgid'" if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then - jump_cmd="<$MUTTJUMP_MODE>$jump_expr" + jump_cmd="$jump_expr" + if [ "$MUTTJUMP_MODE" = search ] ; then + jump_cmd="$jump_cmdall" + fi # Close message-stdin and open terminal-stdin instead. # mutt behaves different if STDIN is no terminal @@ -151,14 +154,10 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then else - case $MUTTJUMP_MODE in - limit) - jump_cmd="l$jump_expr" - ;; - search) - jump_cmd="/$jump_expr" - ;; - esac + jump_cmd="l$jump_expr " + if [ "$MUTTJUMP_MODE" = search ] ; then + jump_cmd="${jump_cmd}lall " + fi 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 "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd \"" + $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: