sync with sylpheed 0.7.4cvs9
authorPaul Mangan <paul@claws-mail.org>
Wed, 20 Mar 2002 07:13:54 +0000 (07:13 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 20 Mar 2002 07:13:54 +0000 (07:13 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/compose.c

index c879100..5789dce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-20
+
+       * src/compose.c: compose_wrap_line(): treat '|' also as quote char.
+         get_indent_length(): treat ':' and '#' also as quote char, and
+         cleaned up using strchr().
+
 2002-03-19
 
        * src/mainwindow.c: modified some menu items.
index 89feda2..8ef55de 100644 (file)
@@ -1,3 +1,8 @@
+2002-03-20 [paul]      0.7.4claws27
+
+       * sync with sylpheed 0.7.4cvs9
+               see ChangeLog entry 2002-03-20
+
 2002-03-19 [christoph] 0.7.4claws26
 
        * src/mh.c
index 4aa07a0..48aef0d 100644 (file)
@@ -1,3 +1,10 @@
+2002-03-20
+
+       * src/compose.c: compose_wrap_line(): '|' ¤â°úÍÑʸ»ú¤È¤·¤Æ°·¤¦
+         ¤è¤¦¤Ë¤·¤¿¡£
+         get_indent_length(): ':' ¤È '#' ¤â°úÍÑʸ»ú¤È¤·¤Æ°·¤¦¤è¤¦¤Ë¤·¡¢
+         strchr() ¤ò»È¤Ã¤ÆÀ°Íý¡£
+
 2002-03-19
 
        * src/mainwindow.c: ¤¤¤¯¤Ä¤«¤Î¥á¥Ë¥å¡¼¹àÌܤò½¤Àµ¡£
index d17f2d9..546ad7a 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws26
+EXTRA_VERSION=claws27
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index c96f057..2f3f165 100644 (file)
@@ -2036,7 +2036,7 @@ static void compose_wrap_line(Compose *compose)
                        }
                        line_end = 1;
                } else {
-                       if (ch_len == 1 && strchr(">:#", *cbuf))
+                       if (ch_len == 1 && strchr(">|:#", *cbuf))
                                quoted = 1;
                        else if (ch_len != 1 || !isspace(*cbuf))
                                quoted = 0;
@@ -2058,7 +2058,7 @@ static void compose_wrap_line(Compose *compose)
                        }
                        line_end = 1;
                } else {
-                       if (line_end && ch_len == 1 && strchr(">:#", *cbuf))
+                       if (line_end && ch_len == 1 && strchr(">|:#", *cbuf))
                                goto compose_end; /* quoted part */
 
                        line_end = 0;
@@ -2166,9 +2166,8 @@ static guint get_indent_length(GtkSText *text, guint start_pos, guint text_len)
                GET_CHAR(i, cbuf, ch_len);
                if (ch_len > 1)
                        break;
-               /* allow space, tab, > or | */
-               if (cbuf[0] != ' ' && cbuf[0] != '\t' &&
-                   cbuf[0] != '>' && cbuf[0] != '|')
+               /* allow space, tab, >, |, : or # */
+               if (!strchr(" \t>|:#", *cbuf))
                        break;
                indent_len++;
        }