Fix wrapping for good.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 842957c4fb929e93eeb50809f9de59d8743a491b..8e83b141670d9e224d7c00c14483d7a76d8a4d5c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2001-10-29 [darko]
+
+       * src/compose.c
+               fix wrapping for good
+
+2001-10-29 [darko]
+
+       * src/compose.c
+               undo previous change as it broke the smart wrapping
+
 2001-10-29 [darko]
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 1390f361f4392b0ef8a9aa4baacff223e8933c0c..426c7de06b863db7d5ebf8ecf24533353ee180d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws13
+EXTRA_VERSION=claws14
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index 7d9222157d1ea55c969d28406f0a3c282293808f..ab24963d663b05ba9af2c23a9c212979c62db8b4 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2399,52 +2399,54 @@ static void compose_wrap_line_all(Compose *compose)
                if (cur_len + ch_len > linewrap_len) {
                        gint tlen;
 
-                       if (line_len == 0 || line_pos != prev_line_pos) {
-                               /* don't wrap URLs */
-                               if (is_url_string(text, line_pos, text_len))
-                                       goto dontwrapurl;
-                               line_len = cur_pos - line_pos;
-                               line_pos = cur_pos;
-                       }
-
                        if (text->use_wchar)
                                tlen = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, line_pos - 1));
                        else {
                                cbuf[0] = GTK_STEXT_INDEX(text, line_pos - 1);
                                tlen = 1;
                        }
-                       if (tlen == 1 && isspace(*cbuf)) {
+                       if ((line_pos - prev_line_pos == indent_len) &&
+                           !is_url_string(text, line_pos, text_len))
+                               line_pos = cur_pos;
+                       if (!is_url_string(text, line_pos, text_len)) {
+                               if (tlen == 1 && isspace(*cbuf)) {
+                                       gtk_stext_set_point(text, line_pos);
+                                       gtk_stext_backward_delete(text, 1);
+                                       text_len--;
+                                       cur_pos--;
+                                       line_pos--;
+                                       cur_len--;
+                                       line_len--;
+                               }
+
                                gtk_stext_set_point(text, line_pos);
-                               gtk_stext_backward_delete(text, 1);
-                               text_len--;
-                               cur_pos--;
-                               line_pos--;
-                               cur_len--;
-                               line_len--;
+                               gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+                               gtk_stext_compact_buffer(text);
+                               text_len++;
+                               cur_pos++;
+                               line_pos++;
+                               cur_len = cur_len - line_len + ch_len;
+                               line_len = 0;
                        }
-
-                       gtk_stext_set_point(text, line_pos);
-                       gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
-                       gtk_stext_compact_buffer(text);
-                       text_len++;
-                       cur_pos++;
-                       line_pos++;
-                       cur_len = cur_len - line_len + ch_len;
-                       line_len = 0;
                        if (linewrap_quote && quote_len) {
-                               /* only if line is not already quoted */
+                               /* only if line is not already quoted 
+                                  if this is long line force wrapping */
                                if (!gtkstext_str_strcmp(text, line_pos,
                                                         text_len, quote_fmt)) {
                                        guint i_len;
 
-                                       i_len = insert_quote(text, quote_len,
-                                                            indent_len,
-                                                            prev_line_pos,
-                                                            text_len,
-                                                            quote_fmt);
+                                       if (line_pos - prev_line_pos > indent_len) {
+                                               i_len = insert_quote(text, quote_len,
+                                                                    indent_len,
+                                                                    prev_line_pos,
+                                                                    text_len,
+                                                                    quote_fmt);
 
-                                       gtk_stext_compact_buffer(text);
-                                       text_len += i_len;
+                                               gtk_stext_compact_buffer(text);
+                                               text_len += i_len;
+                                       }
+                                       else
+                                               continue;
                                        /* for loop above will increase it */
                                        cur_pos = line_pos - 1;
                                        cur_len = 0;
@@ -2457,7 +2459,6 @@ static void compose_wrap_line_all(Compose *compose)
                        continue;
                }
 
-dontwrapurl:
                if (ch_len > 1) {
                        line_pos = cur_pos + 1;
                        line_len = cur_len + ch_len;