summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2021-10-07 20:04:51 -0600
committerEduardo Chappa <chappa@washington.edu>2021-10-07 20:04:51 -0600
commitb4203e1f639ef9a89869247147f6566a52299c07 (patch)
tree851ae5f2296271cd3bc306fe3aba0d35b46494c4
parent7e5259ecfe72a413691a12fd57fc974d9620a853 (diff)
downloadalpine-b4203e1f639ef9a89869247147f6566a52299c07.tar.xz
* Some servers do not allow the Drafts folder to be removed, even when
it is empty. Alpine, however, assumes that if the folder exists, it must contain a draft message. This joint collaboration with Thomas Uhle modifies alpine to not to attempt to continue a draft message if the draft folder is emptty.
-rw-r--r--alpine/send.c7
-rw-r--r--pith/pine.hlp8
2 files changed, 12 insertions, 3 deletions
diff --git a/alpine/send.c b/alpine/send.c
index 5304d49d..8d8d3a69 100644
--- a/alpine/send.c
+++ b/alpine/send.c
@@ -518,7 +518,7 @@ compose_mail(char *given_to, char *fcc_arg, ACTION_S *role_arg,
if((exists=postponed_stream(&stream,
ps_global->VAR_POSTPONED_FOLDER,
- "Postponed", 0)) & FEX_ISFILE){
+ "Postponed", 1)) & FEX_ISFILE){
if(F_ON(F_ALT_COMPOSE_MENU, ps_global) ||
(ret = redraft_prompt("Postponed",PSTPND_PMT,'n')) == 'y'){
if(!redraft(&stream, &outgoing, &body, &fcc, &lcc, &reply,
@@ -544,8 +544,11 @@ compose_mail(char *given_to, char *fcc_arg, ACTION_S *role_arg,
}
}
}
- else if(F_ON(F_ALT_COMPOSE_MENU, ps_global))
+ else if(F_ON(F_ALT_COMPOSE_MENU, ps_global)){
+ q_status_message(SM_ORDER, 3, 3,
+ _("No postponed messages found!"));
done++;
+ }
if(done)
return;
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 7e93719c..38666582 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 600 2021-10-07 18:46:45
+Alpine Commit 601 2021-10-07 20:04:48
============= h_news =================
<HTML>
<HEAD>
@@ -192,6 +192,12 @@ new additions to Alpine, please check it periodically.
given. Additionally, Alpine did not pass these images to an
external browser for display using the external command, and
now it will.
+
+<LI> Some servers do not allow the Drafts folder to be removed, even when
+ it is empty. Alpine, however, assumes that if the folder exists, it
+ must contain a draft message. This joint collaboration with Thomas
+ Uhle modifies alpine to not to attempt to continue a draft message if
+ the draft folder is emptty.
</UL>
<P>