From: Sergey Vlasov <vsu@users.sourceforge.net>
Date: Wed, 9 Oct 2002 16:33:36 +0000 (+0000)
Subject: 	* src/compose.c
X-Git-Tag: w0-1~163
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1dca062fbad87b2d0661345a9dd472b86c079464;hp=92fa7fbbc7ca3afc67bebfdfd5041883fb7e56ac

	* src/compose.c
		Strip CRs whel loading the text into editor in reedit mode.
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2f27a5b68..18e65d740 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-10-09 [sergey]	0.8.5claws7
+
+	* src/compose.c
+		Strip CRs whel loading the text into editor in reedit mode.
+
 2002-10-09 [colin]	0.8.5claws6
 
 	* src/mainwindow.c
diff --git a/configure.in b/configure.in
index 325999d79..937894370 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws7
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index c5b83262f..b26078f2c 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1206,8 +1206,10 @@ void compose_reedit(MsgInfo *msginfo)
 	if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
 		g_warning(_("Can't get text part\n"));
 	else {
-		while (fgets(buf, sizeof(buf), fp) != NULL)
+		while (fgets(buf, sizeof(buf), fp) != NULL) {
+			strcrchomp(buf);
 			gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+		}
 		fclose(fp);
 	}
 	compose_attach_parts(compose, msginfo);