sync with 0.8.1cvs31

diff --git a/ChangeLog b/ChangeLog
index c268dd76f195cb9ccb81a89003e5098cb775f339..4527aa86994c671dd3c85ae74a732cb1e3324018 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-26
+
+       * src/compose.c:
+         join_next_line()
+         compose_wrap_line_all(): backed out the change to join lines that
+         are not indented.
+
 2002-08-23
 
        * src/alertpanel.c: alertpanel_create(): minor modification.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5a5ce66ce784ff3a75fc6e22d9e553c139ba2428..b470ee17dd6c40ccc9570d24a0f57932f8510c41 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-08-26 [paul]      0.8.1claws120
+
+       * sync with 0.8.1cvs31
+               see ChangeLog 2002-08-26
+
 2002-08-25 [alfons]    0.8.1claws119
 
        * src/procmsg.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index ed0e3bb0a875388a28c34c8437d79e6a11cb5c03..9fcfca57b8f35a4f6c9d09c08fb33c283d9f2ddd 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2002-08-26
+
+       * src/compose.c:
+         join_next_line()
+         compose_wrap_line_all(): ¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¹Ô¤ò·ë¹ç¤¹¤ëÊѹ¹
+         ¤ò¸µ¤ËÌᤷ¤¿¡£
+
 2002-08-23
 
        * src/alertpanel.c: alertpanel_create(): ¾¯¤·½¤Àµ¡£

diff --git a/NEWS b/NEWS
index f58ecccb2712d404fe9b39f5ba1cd3572eba241e..75cdae482351b395e00f168b714c98213f1e7f20 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,6 @@ Changes of Sylpheed
       o The ascii-armored encryption and clear text signing has been
         implemented.
     * Line-wrapping improvements and fix
-      o The lines that are not quoted will be wrapped correctly.
       o The cursor movement on auto-wrapping has been fixed.
       o Flickers on auto-wrapping has been repressed.
     * Socket I/O timeout has been implemented.

diff --git a/configure.in b/configure.in
index 392fff4b941ca1a4f499eac8ada53d5ba5271ecf..e72395a64326874ae608fc20f3c3813fe116f2f7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws119
+EXTRA_VERSION=claws120
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 0011a93fc7a9adb6f71a16bb307c3fa1d1626444..896c7a7e2d8b1b4e452b1408267573458c556af1 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2336,7 +2336,7 @@ static gboolean join_next_line(GtkSText *text, guint start_pos, guint tlen,
 
        indent_len = get_indent_length(text, start_pos, tlen);
 
-       if (indent_len == prev_ilen) {
+       if (indent_len > 0 && indent_len == prev_ilen) {
                GET_CHAR(start_pos + indent_len, cbuf, ch_len);
                if (ch_len > 0 && (cbuf[0] != '\n'))
                        do_join = TRUE;
@@ -2407,7 +2407,7 @@ static void compose_wrap_line_all(Compose *compose)
                        gchar cb[MB_LEN_MAX];
 
                        /* should we join the next line */
-                       if (do_delete &&
+                       if (i_len != cur_len && do_delete &&
                            join_next_line(text, cur_pos + 1, tlen, i_len))
                                do_delete = TRUE;
                        else
@@ -2556,9 +2556,11 @@ static void compose_wrap_line_all(Compose *compose)
                        cur_pos = line_pos - 1;
                        /* start over with current line */
                        is_new_line = TRUE;
-                       line_len = 0;
-                       cur_len = 0;
-                       do_delete = TRUE;
+                       line_len = cur_len = 0;
+                       if (i_len)
+                               do_delete = TRUE;
+                       else
+                               do_delete = FALSE;
 #ifdef WRAP_DEBUG
                        g_print("after CR insert ");
                        dump_text(text, line_pos, tlen, 1);