aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-tools.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0772093ae5..0bd4640037 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-16 Jason Leach <jleach@ximian.com>
+
+ * mail-tools.c (mail_tool_quote_message): Only starting cutting
+ the signature out when we match "-- \n", so "--\n" in the middle
+ of a mail won't omit the rest for a quoted reply. Bug #7454.
+
2001-08-16 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (confirm_expunge): Respect the user's desire to
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 35e64db093..f8020bd076 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -389,7 +389,7 @@ mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...)
len = strcspn (s, "\n");
if (len == 0 && !*s)
break;
- if (!strncmp ("-- \n", s, 4) || !strncmp ("--\n", s, 3))
+ if (!strncmp ("-- \n", s, 4))
break;
sprintf (d, "> %.*s\n", len, s);
s += len;