summaryrefslogtreecommitdiff
path: root/pith
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2017-11-10 19:55:54 -0700
committerEduardo Chappa <chappa@washington.edu>2017-11-10 19:55:54 -0700
commit6c79de9847d04e40dea488d1dd919b72075c552a (patch)
tree856486979120f83dd9dd0dc862485d00922049da /pith
parentf77dcb38620a334fffbd8153605f7943107dd28e (diff)
downloadalpine-6c79de9847d04e40dea488d1dd919b72075c552a.tar.xz
* If the first part of a message is multipart/alternative, and the
first part of this is also a multipart type, then Alpine might fail to select the first text part when replying to a message. Reported by Lucio Chiappetti.
Diffstat (limited to 'pith')
-rw-r--r--pith/pine.hlp7
-rw-r--r--pith/reply.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 7e67079f..bc34f997 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 225 2017-11-08 14:18:33
+Alpine Commit 226 2017-11-10 19:55:39
============= h_news =================
<HTML>
<HEAD>
@@ -213,6 +213,11 @@ Bugs that have been addressed include:
<LI> When colors are edited from the main setup configuration screen, some
color settings are not updated until Alpine is restarted. Reported by
Andrew Hill.
+
+ <LI> If the first part of a message is multipart/alternative, and the
+ first part of this is also a multipart type, then Alpine might
+ fail to select the first text part when replying to a message.
+ Reported by Lucio Chiappetti.
</UL>
<P>
diff --git a/pith/reply.c b/pith/reply.c
index 58b10b27..4c0a6f44 100644
--- a/pith/reply.c
+++ b/pith/reply.c
@@ -1296,6 +1296,10 @@ reply_body_text(struct mail_bodystruct *body, struct mail_bodystruct **new_body)
PART *part;
int got_one = 0;
+ if((part = body->nested.part) != NULL
+ && part->body.type == TYPEMULTIPART)
+ return reply_body_text(&body->nested.part->body, new_body);
+
if(ps_global->force_prefer_plain
|| (!ps_global->force_no_prefer_plain
&& F_ON(F_PREFER_PLAIN_TEXT, ps_global))){