2006-01-10 [colin] 1.9.100cvs134

	* src/compose.c
		Fix broken line joins in certain conditions
		(between two quoted lines: <enter><enter><up>
		 <type a wrapped sentence><go in the first line>
		 <insert more text><watch as line joining failed>)

diff --git a/ChangeLog b/ChangeLog
index c58841ded333f7c7b66bcbf3ad7b8a0f8c995417..0bd767578643635df5ae2998315dd4f5e8c3a124 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-10 [colin]     1.9.100cvs134
+
+       * src/compose.c
+               Fix broken line joins in certain conditions
+               (between two quoted lines: <enter><enter><up>
+                <type a wrapped sentence><go in the first line>
+                <insert more text><watch as line joining failed>)
+
 2006-01-10 [paul]      1.9.100cvs133
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 657cdde6b1174897dacdd73d5a567dac95de4313..b84b826e6e3901bc09391789f931993b6d30ff59 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1117,3 +1117,4 @@
 ( cvs diff -u -r 1.382.2.215 -r 1.382.2.216 src/compose.c;  ) > 1.9.100cvs131.patchset
 ( cvs diff -u -r 1.83.2.55 -r 1.83.2.56 src/mimeview.c;  ) > 1.9.100cvs132.patchset
 ( cvs diff -u -r 1.382.2.216 -r 1.382.2.217 src/compose.c;  cvs diff -u -r 1.36.2.50 -r 1.36.2.51 src/common/utils.c;  ) > 1.9.100cvs133.patchset
+( cvs diff -u -r 1.382.2.217 -r 1.382.2.218 src/compose.c;  ) > 1.9.100cvs134.patchset

diff --git a/configure.ac b/configure.ac
index 6ae97c3f01572e49e5033f040b39120f2a8b4af3..a168be7ccfac62243029a8ca24cba016c371110c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=133
+EXTRA_VERSION=134
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 094b5a0200396efc817e9a02e3655477ccee6f1c..f810f5ba74b9465e508fdb696cf438c5c4a3ac48 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -8136,7 +8136,8 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
                gtk_text_buffer_place_cursor(buffer, iter);
        } else {
-               if (strcmp(text, "\n") || automatic_break)
+               if (strcmp(text, "\n") || automatic_break
+               || gtk_text_iter_starts_line(iter))
                        gtk_text_buffer_insert(buffer, iter, text, len);
                else {
                        debug_print("insert nowrap \\n\n");