From befe86f11f0222efd9d9a92e5f2832c708eadd6f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 3 Mar 2004 23:28:44 +0000 Subject: [PATCH] Allow to select the last word in the buffer. (#135487, Paolo Borelli) Thu Mar 4 00:31:54 2004 Matthias Clasen * gtk/gtktextview.c (extend_selection): * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Allow to select the last word in the buffer. (#135487, Paolo Borelli) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktextview.c | 12 +++++++++--- 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42a97426f2..96f8e491e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 4 00:31:54 2004 Matthias Clasen + + * gtk/gtktextview.c (extend_selection): + * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Allow + to select the last word in the buffer. (#135487, Paolo Borelli) + Wed Mar 3 23:54:31 2004 Matthias Clasen * gtk/gtkentrycompletion.c: Doc update. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 42a97426f2..96f8e491e9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Mar 4 00:31:54 2004 Matthias Clasen + + * gtk/gtktextview.c (extend_selection): + * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Allow + to select the last word in the buffer. (#135487, Paolo Borelli) + Wed Mar 3 23:54:31 2004 Matthias Clasen * gtk/gtkentrycompletion.c: Doc update. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 42a97426f2..96f8e491e9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Mar 4 00:31:54 2004 Matthias Clasen + + * gtk/gtktextview.c (extend_selection): + * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Allow + to select the last word in the buffer. (#135487, Paolo Borelli) + Wed Mar 3 23:54:31 2004 Matthias Clasen * gtk/gtkentrycompletion.c: Doc update. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 42a97426f2..96f8e491e9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Mar 4 00:31:54 2004 Matthias Clasen + + * gtk/gtktextview.c (extend_selection): + * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Allow + to select the last word in the buffer. (#135487, Paolo Borelli) + Wed Mar 3 23:54:31 2004 Matthias Clasen * gtk/gtkentrycompletion.c: Doc update. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 42a97426f2..96f8e491e9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Mar 4 00:31:54 2004 Matthias Clasen + + * gtk/gtktextview.c (extend_selection): + * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Allow + to select the last word in the buffer. (#135487, Paolo Borelli) + Wed Mar 3 23:54:31 2004 Matthias Clasen * gtk/gtkentrycompletion.c: Doc update. diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index dbb4e2ffcb..78f907da9d 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -4617,8 +4617,11 @@ gtk_text_view_move_cursor_internal (GtkTextView *text_view, case GTK_MOVEMENT_WORDS: if (count < 0) gtk_text_iter_backward_visible_word_starts (&newplace, -count); - else if (count > 0) - gtk_text_iter_forward_visible_word_ends (&newplace, count); + else if (count > 0) + { + if (!gtk_text_iter_forward_visible_word_ends (&newplace, count)) + gtk_text_iter_forward_to_end (&newplace); + } break; case GTK_MOVEMENT_DISPLAY_LINES: @@ -5398,7 +5401,10 @@ extend_selection (GtkTextView *text_view, gtk_text_iter_backward_visible_word_start (start); if (!gtk_text_iter_ends_word (end)) - gtk_text_iter_forward_visible_word_end (end); + { + if (!gtk_text_iter_forward_visible_word_end (end)) + gtk_text_iter_forward_to_end (end); + } } else extend = FALSE;