* src/compose.c

		Strip CRs whel loading the text into editor in reedit mode.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2f27a5b68d0e869a077a56428020dd35acaeb86c..18e65d7403f8e7a12c014cbf589ad348dd3d2189 100644 (file)
--- 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 325999d79f78a735b4773394c6eb298d70e02f41..9378943704c8cfd4b91cfc4f09537de0af8cb7c6 100644 (file)
--- 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 c5b83262f7a669f126cb2926cecd7faefeed6a39..b26078f2c0c59bc70229c096e3614ba37b1506f9 100644 (file)
--- 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);