diff --git a/ChangeLog b/ChangeLog index c25fe15fa9..c674f21a42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 5 15:33:38 2003 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): + If at the end of the buffer, move to the end iter - + parallels behavior of move_iter_to_previous_line. + (#81960, Padraig O'Briain) + Thu Jun 5 16:12:54 2003 Owen Taylor #80023, Yao Zhang, TOKUNAGA Hiroyuki diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c25fe15fa9..c674f21a42 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Jun 5 15:33:38 2003 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): + If at the end of the buffer, move to the end iter - + parallels behavior of move_iter_to_previous_line. + (#81960, Padraig O'Briain) + Thu Jun 5 16:12:54 2003 Owen Taylor #80023, Yao Zhang, TOKUNAGA Hiroyuki diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c25fe15fa9..c674f21a42 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Thu Jun 5 15:33:38 2003 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): + If at the end of the buffer, move to the end iter - + parallels behavior of move_iter_to_previous_line. + (#81960, Padraig O'Briain) + Thu Jun 5 16:12:54 2003 Owen Taylor #80023, Yao Zhang, TOKUNAGA Hiroyuki diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c25fe15fa9..c674f21a42 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Jun 5 15:33:38 2003 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): + If at the end of the buffer, move to the end iter - + parallels behavior of move_iter_to_previous_line. + (#81960, Padraig O'Briain) + Thu Jun 5 16:12:54 2003 Owen Taylor #80023, Yao Zhang, TOKUNAGA Hiroyuki diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c25fe15fa9..c674f21a42 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Jun 5 15:33:38 2003 Owen Taylor + + * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): + If at the end of the buffer, move to the end iter - + parallels behavior of move_iter_to_previous_line. + (#81960, Padraig O'Briain) + Thu Jun 5 16:12:54 2003 Owen Taylor #80023, Yao Zhang, TOKUNAGA Hiroyuki diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 99414521bc..52e7781371 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -2723,6 +2723,9 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout, line = _gtk_text_line_next_excluding_last (line); } + if (!found_after) + gtk_text_buffer_get_end_iter (layout->buffer, iter); + return !gtk_text_iter_equal (iter, &orig) && !gtk_text_iter_is_end (iter);