From 056a9a3236ad14e283c0e123d6cf095901563fa1 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Fri, 17 Aug 2001 03:07:42 +0000 Subject: Only starting cutting the signature out when we match "-- \n", so "--\n" 2001-08-16 Jason Leach * 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. svn path=/trunk/; revision=12143 --- mail/ChangeLog | 6 ++++++ mail/mail-tools.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'mail') 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 + + * 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 * 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; -- cgit v1.2.3