2005-12-28 [wwp] 1.9.100cvs110
* src/compose.c fix a minor wrapping issue w/ autowrap disabled (patch by Colin).
This commit is contained in:
parent
8d566aa403
commit
f582301147
|
@ -1,3 +1,8 @@
|
|||
2005-12-28 [wwp] 1.9.100cvs110
|
||||
|
||||
* src/compose.c
|
||||
fix a minor wrapping issue w/ autowrap disabled (patch by Colin).
|
||||
|
||||
2005-12-28 [wwp] 1.9.100cvs109
|
||||
|
||||
* doc/faq/.cvsignore
|
||||
|
|
|
@ -1093,3 +1093,4 @@
|
|||
( cvs diff -u -r 1.150.2.47 -r 1.150.2.48 src/procmsg.c; ) > 1.9.100cvs107.patchset
|
||||
( cvs diff -u -r 1.100.2.31 -r 1.100.2.32 AUTHORS; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/authors.h; ) > 1.9.100cvs108.patchset
|
||||
( diff -u /dev/null doc/faq/.cvsignore; diff -u /dev/null doc/faq/de/.cvsignore; diff -u /dev/null doc/faq/en/.cvsignore; diff -u /dev/null doc/faq/es/.cvsignore; diff -u /dev/null doc/faq/fr/.cvsignore; diff -u /dev/null doc/faq/it/.cvsignore; diff -u /dev/null doc/manual/.cvsignore; diff -u /dev/null doc/manual/de/.cvsignore; diff -u /dev/null doc/manual/en/.cvsignore; diff -u /dev/null doc/manual/es/.cvsignore; diff -u /dev/null doc/manual/fr/.cvsignore; diff -u /dev/null doc/manual/ja/.cvsignore; diff -u /dev/null src/plugins/mathml_viewer/.cvsignore; cvs diff -u -r 1.1.16.1 -r 1.1.16.2 po/.cvsignore; ) > 1.9.100cvs109.patchset
|
||||
( cvs diff -u -r 1.382.2.210 -r 1.382.2.211 src/compose.c; ) > 1.9.100cvs110.patchset
|
||||
|
|
|
@ -11,7 +11,7 @@ MINOR_VERSION=9
|
|||
MICRO_VERSION=100
|
||||
INTERFACE_AGE=0
|
||||
BINARY_AGE=0
|
||||
EXTRA_VERSION=109
|
||||
EXTRA_VERSION=110
|
||||
EXTRA_RELEASE=
|
||||
EXTRA_GTK2_VERSION=
|
||||
|
||||
|
|
|
@ -3294,6 +3294,7 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
|
|||
}
|
||||
|
||||
/* go until paragraph end (empty line) */
|
||||
|
||||
while (!gtk_text_iter_ends_line(&iter)) {
|
||||
gchar *scanpos = NULL;
|
||||
/* parse table - in order of priority */
|
||||
|
@ -3328,6 +3329,11 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
|
|||
gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
|
||||
gint walk_pos;
|
||||
|
||||
if (!prev_autowrap)
|
||||
g_signal_handlers_block_by_func(G_OBJECT(buffer),
|
||||
G_CALLBACK(text_inserted),
|
||||
compose);
|
||||
|
||||
if (gtk_text_iter_has_tag(&iter, compose->no_wrap_tag) && !force)
|
||||
goto colorize;
|
||||
|
||||
|
@ -3402,6 +3408,10 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
|
|||
}
|
||||
|
||||
colorize:
|
||||
if (!prev_autowrap)
|
||||
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
|
||||
G_CALLBACK(text_inserted),
|
||||
compose);
|
||||
end_of_line = iter;
|
||||
while (!gtk_text_iter_ends_line(&end_of_line)) {
|
||||
gtk_text_iter_forward_char(&end_of_line);
|
||||
|
|
Loading…
Reference in a new issue