From f3105604b64c8874f937bbded571579e4f8cf240 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 23 Feb 2007 18:06:03 +0000 Subject: [PATCH] 2007-02-23 [colin] 2.7.2cvs68 * src/compose.c Fix bug that prevented colorization to work without wrap quotation option --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 10 ++++------ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index efd15ffc0..864dc1535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-23 [colin] 2.7.2cvs68 + + * src/compose.c + Fix bug that prevented colorization to + work without wrap quotation option + 2007-02-23 [colin] 2.7.2cvs67 * src/addr_compl.c diff --git a/PATCHSETS b/PATCHSETS index f7536b6a9..16cb70ca0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2385,3 +2385,4 @@ ( cvs diff -u -r 1.27.2.28 -r 1.27.2.29 src/addr_compl.c; ) > 2.7.2cvs65.patchset ( cvs diff -u -r 1.60.2.81 -r 1.60.2.82 src/addressbook.c; cvs diff -u -r 1.28.2.23 -r 1.28.2.24 src/addrindex.c; ) > 2.7.2cvs66.patchset ( cvs diff -u -r 1.27.2.29 -r 1.27.2.30 src/addr_compl.c; ) > 2.7.2cvs67.patchset +( cvs diff -u -r 1.382.2.360 -r 1.382.2.361 src/compose.c; ) > 2.7.2cvs68.patchset diff --git a/configure.ac b/configure.ac index 2ac5e94db..73d3c4997 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=67 +EXTRA_VERSION=68 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 32dfab059..a3225687c 100644 --- a/src/compose.c +++ b/src/compose.c @@ -3781,12 +3781,6 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, quote_str = compose_get_quote_str(buffer, &iter, "e_len); if (quote_str) { - if (!wrap_quote) { - if (startq_offset == -1) { - startq_offset = gtk_text_iter_get_offset(&iter); - } - goto colorize; - } debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str); if (startq_offset == -1) startq_offset = gtk_text_iter_get_offset(&iter); @@ -3798,6 +3792,9 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, else quotelevel = 2; } + if (!wrap_quote) { + goto colorize; + } } else { if (startq_offset == -1) noq_offset = gtk_text_iter_get_offset(&iter); @@ -3915,6 +3912,7 @@ colorize: gtk_text_buffer_get_iter_at_offset( buffer, &startquote, startq_offset); endquote = iter; + switch (quotelevel) { case 0: gtk_text_buffer_apply_tag_by_name( buffer, "quote0", &startquote, &endquote); -- 2.25.1