summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alpine/mailcmd.c17
-rw-r--r--pith/pine.hlp4
2 files changed, 19 insertions, 2 deletions
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c
index 5e95d334..19becd11 100644
--- a/alpine/mailcmd.c
+++ b/alpine/mailcmd.c
@@ -2381,8 +2381,21 @@ cmd_bounce(struct pine *state, MSGNO_S *msgmap, int aopt)
ACTION_S *role = NULL;
if(any_messages(msgmap, NULL, "to Bounce")){
- if(MCMD_ISAGG(aopt) && !pseudo_selected(state->mail_stream, msgmap))
- return rv;
+ long i;
+ if(MCMD_ISAGG(aopt)){
+ if(!pseudo_selected(state->mail_stream, msgmap))
+ return rv;
+ }
+ else if((i = any_lflagged(msgmap, MN_SLCT)) > 0
+ && get_lflag(state->mail_stream, msgmap,
+ mn_m2raw(msgmap, mn_get_cur(msgmap)), MN_SLCT) == 0)
+ q_status_message(SM_ORDER | SM_DING, 3, 4,
+ _("WARNING: non-selected message is being bounced!"));
+ else if (i > 1L
+ && get_lflag(state->mail_stream, msgmap,
+ mn_m2raw(msgmap, mn_get_cur(msgmap)), MN_SLCT))
+ q_status_message(SM_ORDER | SM_DING, 3, 4,
+ _("WARNING: not bouncing all selected messages!"));
if(MCMD_ISAGG(aopt)){ /* check for possible role */
PAT_STATE pstate;
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 23c88ea6..78054ff1 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -334,6 +334,10 @@ Additions include:
<LI> SMIME: Turn off automatic signing and encrypting of a message when
bouncing. Suggested after a discussion with Matthias Rieber.
+
+ <LI> When messages are selected, warn the user if a message that is not
+ selected will be bounced, or if not all selected messages will be
+ bounced. Suggested by Ulf-Dietrich Braumann.
</UL>