projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
curs_main.c
diff --git
a/curs_main.c
b/curs_main.c
index
1f2c605
..
3fd4641
100644
(file)
--- a/
curs_main.c
+++ b/
curs_main.c
@@
-557,8
+557,10
@@
int mutt_index_menu (void)
DrawFullLine = 0;
CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
SETCOLOR (MT_COLOR_STATUS);
DrawFullLine = 0;
CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
SETCOLOR (MT_COLOR_STATUS);
+ BKGDSET (MT_COLOR_STATUS);
mutt_paddstr (COLS, buf);
SETCOLOR (MT_COLOR_NORMAL);
mutt_paddstr (COLS, buf);
SETCOLOR (MT_COLOR_NORMAL);
+ BKGDSET (MT_COLOR_NORMAL);
sidebar_set_buffystats (Context);
menu->redraw &= ~REDRAW_STATUS;
if (option (OPTXTERMSETTITLES)) {
sidebar_set_buffystats (Context);
menu->redraw &= ~REDRAW_STATUS;
if (option (OPTXTERMSETTITLES)) {
@@
-955,7
+957,7
@@
int mutt_index_menu (void)
unset_option (OPTHIDEREAD);
}
FREE (&Context->pattern);
unset_option (OPTHIDEREAD);
}
FREE (&Context->pattern);
- Context->pattern = s
afe_str
dup (buf);
+ Context->pattern = s
tr_
dup (buf);
}
if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
}
if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
@@
-1295,6
+1297,10
@@
int mutt_index_menu (void)
menu->current = mutt_thread_next_unread (Context, CURHDR);
}
menu->current = mutt_thread_next_unread (Context, CURHDR);
}
+ if (option (OPTPGPAUTODEC) &&
+ (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+
if ((op = mutt_display_message (CURHDR)) == -1) {
unset_option (OPTNEEDRESORT);
break;
if ((op = mutt_display_message (CURHDR)) == -1) {
unset_option (OPTNEEDRESORT);
break;
@@
-2000,6
+2006,10
@@
int mutt_index_menu (void)
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_ATTACH;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_ATTACH;
+
+ if (option (OPTPGPAUTODEC) &&
+ (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
ci_send_message (SENDFORWARD, NULL, NULL, Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
break;
ci_send_message (SENDFORWARD, NULL, NULL, Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
break;
@@
-2014,6
+2024,11
@@
int mutt_index_menu (void)
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_ATTACH;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_ATTACH;
+
+ if (option (OPTPGPAUTODEC) &&
+ (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+
ci_send_message (SENDREPLY | SENDGROUPREPLY, NULL, NULL, Context,
tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
ci_send_message (SENDREPLY | SENDGROUPREPLY, NULL, NULL, Context,
tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
@@
-2024,6
+2039,11
@@
int mutt_index_menu (void)
CHECK_ATTACH;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_ATTACH;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
+
+ if (option (OPTPGPAUTODEC) &&
+ (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+
ci_send_message (SENDREPLY | SENDLISTREPLY, NULL, NULL, Context,
tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
ci_send_message (SENDREPLY | SENDLISTREPLY, NULL, NULL, Context,
tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
@@
-2145,7
+2165,7
@@
int mutt_index_menu (void)
sleep (2);
}
else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
sleep (2);
}
else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
- s
afe_str
casecmp (CURHDR->env->followup_to, "poster") ||
+ s
tr_
casecmp (CURHDR->env->followup_to, "poster") ||
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=
M_YES) {
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=
M_YES) {
@@
-2177,6
+2197,11
@@
int mutt_index_menu (void)
CHECK_ATTACH;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_ATTACH;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
+
+ if (option (OPTPGPAUTODEC) &&
+ (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+
ci_send_message (SENDREPLY, NULL, NULL, Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
break;
ci_send_message (SENDREPLY, NULL, NULL, Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
break;