sync with 0.8.1cvs27

diff --git a/ChangeLog b/ChangeLog
index ccf4b5cb3a16f0d5267445356caa3747150fceb1..e6ff36f645e045c0997541dc50b67a2e24c341bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-21
+
+       * src/compose.c: improved line wrapping.
+         join_next_line()
+         compose_wrap_line_all(): also join lines that are not indented.
+         dump_text(): handle multi-byte strings correctly.
+
 2002-08-21
 
        * src/compose.c: compose_wrap_line_all(): fix for auto-wrapping

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d2f0ae768c4c79d95454faca60f146e45e1481cf..b423562f2534b932d09df96d3558d1831fe87c29 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-08-21 [paul]      0.8.1claws90
+
+       * sync with 0.8.1cvs27
+               see ChangeLog 2002-08-21
+
 2002-08-21 [paul]      0.8.1claws89
 
        * src/summaryview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 3b11032c6798505293a0a08341a781aa1c143bea..1347d9668b2cb1f23108fdb6b20acc6a6b31900f 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2002-08-21
+
+       * src/compose.c: ¹ÔÀÞ¤êÊÖ¤·¤ò²þÎÉ¡£
+         join_next_line()
+         compose_wrap_line_all(): ¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¹Ô¤â·ë¹ç¡£
+         dump_text(): ¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»ú¤âÀµ¤·¤¯°·¤¦¤è¤¦¤Ë¤·¤¿¡£
+
 2002-08-21
 
        * src/compose.c: compose_wrap_line_all(): ¼«Æ°²þ¹Ô¤Î¤¿¤á¤Î½¤Àµ

diff --git a/configure.in b/configure.in
index 2101648b17bdb1037fb92501b632c6bc1a529c8c..54c5759b83d0074da0ab8e9e5c578e350f482987 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=claws89
+EXTRA_VERSION=claws90
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 268bb78f0b6fa3a21d6369c7b54894bd7272b1d3..1882e9ef876794c047a9a82c1a6f535b75158dcc 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2212,15 +2212,16 @@ compose_end:
 /* Darko: used when I debug wrapping */
 void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
 {
-       gint i;
-       gchar ch;
+       gint i, clen;
+       gchar cbuf[MB_LEN_MAX];
 
        printf("%d [", pos);
        for (i = pos; i < tlen; i++) {
-               ch = GTK_STEXT_INDEX(text, i);
-               if (breakoncr && ch == '\n')
+               GET_CHAR(i, cbuf, clen);
+               if (clen < 0) break;
+               if (breakoncr && clen == 1 && cbuf[0] == '\n')
                        break;
-               printf("%c", ch);
+               fwrite(cbuf, clen, 1, stdout);
        }
        printf("]\n");
 }
@@ -2333,7 +2334,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 > 0) && (indent_len == prev_ilen)) {
+       if (indent_len == prev_ilen) {
                GET_CHAR(start_pos + indent_len, cbuf, ch_len);
                if (ch_len > 0 && (cbuf[0] != '\n'))
                        do_join = TRUE;
@@ -2402,7 +2403,7 @@ static void compose_wrap_line_all(Compose *compose)
                        gchar cb[MB_LEN_MAX];
 
                        /* should we join the next line */
-                       if ((i_len != cur_len) && do_delete &&
+                       if (do_delete &&
                            join_next_line(text, cur_pos + 1, tlen, i_len))
                                do_delete = TRUE;
                        else
@@ -2550,10 +2551,7 @@ static void compose_wrap_line_all(Compose *compose)
                        is_new_line = TRUE;
                        line_len = 0;
                        cur_len = 0;
-                       if (i_len)
-                               do_delete = TRUE;
-                       else
-                               do_delete = FALSE;
+                       do_delete = TRUE;
 #ifdef WRAP_DEBUG
                        g_print("after CR insert ");
                        dump_text(text, line_pos, tlen, 1);