sync with 0.9.8cvs4
authorPaul Mangan <paul@claws-mail.org>
Wed, 21 Jan 2004 07:56:34 +0000 (07:56 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 21 Jan 2004 07:56:34 +0000 (07:56 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/gtk/gtkstext.c

index 137928e..4c959b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): also break between mutlibyte
+         and single-byte characters.
+
 2004-01-20
 
        * src/gtkstext.c: find_line_params(): break lines between multibyte
index 8296898..2db185c 100644 (file)
@@ -1,3 +1,8 @@
+2004-01-21 [paul]      0.9.8claws40
+
+       * sync with 0.9.8cvs4
+               see ChangeLog 2004-01-20
+
 2004-01-20 [christoph] 0.9.8claws39
 
        * src/folderview.c
index 83875df..34e3383 100644 (file)
@@ -1,3 +1,8 @@
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): ¥Þ¥ë¥Á¥Ð¥¤¥È¤È¥·¥ó¥°¥ë¥Ð¥¤¥È
+         Ê¸»ú¤Î´Ö¤Ç¤â²þ¹Ô¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2004-01-20
 
        * src/gtkstext.c: find_line_params(): ¥ï¡¼¥É¥é¥Ã¥×¥â¡¼¥É¤Î¤È¤­
index a13d7d8..1bb6231 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 08d2383..5e8d3a8 100644 (file)
@@ -5228,16 +5228,22 @@ find_line_params (GtkSText* text,
                      if (text->use_wchar)
                        {
                          gchar mb[MB_LEN_MAX];
+                         gint mb_len_1;
+                         gint mb_len_2;
 
+                         mb_len_1 = wctomb (mb, GTK_STEXT_INDEX (text, lp.end.index));
                          while (!gdk_iswspace (GTK_STEXT_INDEX (text, lp.end.index)) &&
                                 (lp.end.index > lp.start.index))
                            {
                              decrement_mark (&lp.end);
                              lp.displayable_chars -= 1;
 
+                             mb_len_2 = wctomb (mb, GTK_STEXT_INDEX (text, lp.end.index));
                              /* multibyte chars are always breakable */
-                             if (wctomb (mb, GTK_STEXT_INDEX (text, lp.end.index)) > 1)
+                             if (mb_len_1 > 1 ||
+                                 (mb_len_1 == 1 && mb_len_2 > 1))
                                break;
+                             mb_len_1 = mb_len_2;
                            }
                        }
                      else