Index: branches/2018Q3/www/seamonkey/distinfo
===================================================================
--- branches/2018Q3/www/seamonkey/distinfo	(revision 475192)
+++ branches/2018Q3/www/seamonkey/distinfo	(revision 475193)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530930170
-SHA256 (seamonkey-2.49.4.source.tar.xz) = 3e9aee0beb0094f26b935016a02ba9e2ab4ab46434e018b55d1f2baf541ee181
-SIZE (seamonkey-2.49.4.source.tar.xz) = 230165332
+TIMESTAMP = 1531362029
+SHA256 (seamonkey-2.49.4.source.tar.xz) = c8a66774d0a3525698b559fa2c41397186f2de99c5733e35b8eafb0ae5ccc4ee
+SIZE (seamonkey-2.49.4.source.tar.xz) = 231795176
Index: branches/2018Q3/www/seamonkey/files/patch-bug1473893
===================================================================
--- branches/2018Q3/www/seamonkey/files/patch-bug1473893	(revision 475192)
+++ branches/2018Q3/www/seamonkey/files/patch-bug1473893	(nonexistent)
@@ -1,73 +0,0 @@
-commit f883eeb39f24
-Author: Jorg K <jorgk@jorgk.com>
-Date:   Mon Jul 9 00:09:58 2018 +0200
-
-    Bug 1473893 - Don't use parsed HTML MIME class if saving, processing attachments and in other cases. r=aceman a=jorgk
-
----
- mailnews/db/gloda/test/unit/test_mime_attachments_size.js |  3 ---
- mailnews/mime/src/mimei.cpp                               | 12 ++++++++++--
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git mailnews/db/gloda/test/unit/test_mime_attachments_size.js mailnews/db/gloda/test/unit/test_mime_attachments_size.js
-index 7eff626979..389bebee42 100644
---- mailnews/db/gloda/test/unit/test_mime_attachments_size.js
-+++ mailnews/db/gloda/test/unit/test_mime_attachments_size.js
-@@ -211,19 +211,16 @@ function check_attachments(aMimeMsg, eps
-   for (let att of aMimeMsg.allUserAttachments) {
-     dump("*** Attachment now is " + att.name + " " + att.size + "\n");
-     do_check_true(Math.abs(att.size - originalTextByteCount) <= epsilon);
-     totalSize += att.size;
-   }
- 
-   // undefined means true
-   if (checkTotalSize !== false) {
--    // Account for stuff added by libmime, incl. two CRLF or LF before and after.
--    totalSize += "<meta http-equiv=\"content-type\" content=\"text\/html; \">".length;
--    totalSize += ("@mozilla.org/windows-registry-key;1" in Cc) ? 4 : 2;
-     dump("*** Total size comparison: " + totalSize + " vs " + aMimeMsg.size + "\n");
-     do_check_true(Math.abs(aMimeMsg.size - totalSize) <= epsilon);
-   }
- 
-   async_driver();
- }
- 
- function* test_message_attachments(info) {
-diff --git mailnews/mime/src/mimei.cpp mailnews/mime/src/mimei.cpp
-index 450eae584a..8290a83e63 100644
---- mailnews/mime/src/mimei.cpp
-+++ mailnews/mime/src/mimei.cpp
-@@ -505,21 +505,29 @@ mime_find_class (const char *content_typ
-       clazz = (MimeObjectClass *)&mimeUntypedTextClass;
- 
-     /* Subtypes of text...
-     */
-     else if (!PL_strncasecmp(content_type,      "text/", 5))
-     {
-       if      (!PL_strcasecmp(content_type+5,    "html"))
-       {
--        if (opts
--            && opts->format_out == nsMimeOutput::nsMimeMessageSaveAs)
-+        if (opts &&
-+            (opts->format_out == nsMimeOutput::nsMimeMessageSaveAs ||
-+             opts->format_out == nsMimeOutput::nsMimeMessageFilterSniffer ||
-+             opts->format_out == nsMimeOutput::nsMimeMessageDecrypt ||
-+             opts->format_out == nsMimeOutput::nsMimeMessageAttach))
-           // SaveAs in new modes doesn't work yet.
-         {
--          clazz = (MimeObjectClass *)&mimeInlineTextHTMLParsedClass;
-+          // Don't use the parsed HTML class if we're ...
-+          // - saving the HTML of a message
-+          // - getting message content for filtering
-+          // - snarfing attachments (nsMimeMessageDecrypt used in SnarfMsgAttachment)
-+          // - processing attachments (like deleting attachments).
-+          clazz = (MimeObjectClass *)&mimeInlineTextHTMLClass;
-           types_of_classes_to_disallow = 0;
-         }
-         else if (html_as == 0 || html_as == 4) // Render sender's HTML
-           clazz = (MimeObjectClass *)&mimeInlineTextHTMLParsedClass;
-         else if (html_as == 1) // convert HTML to plaintext
-           // Do a HTML->TXT->HTML conversion, see mimethpl.h.
-           clazz = (MimeObjectClass *)&mimeInlineTextHTMLAsPlaintextClass;
-         else if (html_as == 2) // display HTML source
-

Property changes on: branches/2018Q3/www/seamonkey/files/patch-bug1473893
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 475192)
+++ branches/2018Q3	(revision 475193)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r475191