X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextdisplay.c;h=4be120d80cf9314ffdc085da25538d55688c6215;hb=657c65ed4bef8fd16049197163151e33722b8b5a;hp=e531a4652653851fdb71222c9d178cdd64f40e5b;hpb=783239524314e48d2d1ee908394d9e4416279037;p=~andy%2Fgtk

diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index e531a4652..4be120d80 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -803,7 +803,8 @@ gtk_text_layout_draw (GtkTextLayout *layout,
                                                 &line_start,
                                                 line, 0);
               line_end = line_start;
-              gtk_text_iter_forward_to_line_end (&line_end);
+	      if (!gtk_text_iter_ends_line (&line_end))
+		gtk_text_iter_forward_to_line_end (&line_end);
               byte_count = gtk_text_iter_get_line_index (&line_end);     
 
               if (gtk_text_iter_compare (&selection_start, &line_end) <= 0 &&
@@ -817,7 +818,7 @@ gtk_text_layout_draw (GtkTextLayout *layout,
                   if (gtk_text_iter_compare (&selection_end, &line_end) <= 0)
                     selection_end_index = gtk_text_iter_get_line_index (&selection_end);
                   else
-                    selection_end_index = byte_count;
+                    selection_end_index = MAX(byte_count, 1);
                 }
             }