summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtktextview.c5
4 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e52f916e9..d4e8630f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
+ jump to the next line if we are at the end of the line.
+
2005-06-23 Tor Lillqvist <tml@novell.com>
Improve and simplify line segment rendering on Win32, especially
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e52f916e9..d4e8630f8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-24 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
+ jump to the next line if we are at the end of the line.
+
2005-06-23 Tor Lillqvist <tml@novell.com>
Improve and simplify line segment rendering on Win32, especially
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e52f916e9..d4e8630f8 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-24 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
+ jump to the next line if we are at the end of the line.
+
2005-06-23 Tor Lillqvist <tml@novell.com>
Improve and simplify line segment rendering on Win32, especially
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index daa10ea49..e22913cf8 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4752,6 +4752,8 @@ gtk_text_view_move_cursor_internal (GtkTextView *text_view,
break;
case GTK_MOVEMENT_PARAGRAPHS:
+ g_print ("move paragraphs: %d %d\n",
+ count, gtk_text_iter_get_line_offset (&newplace));
if (count > 0)
{
if (!gtk_text_iter_ends_line (&newplace))
@@ -5027,7 +5029,8 @@ gtk_text_view_scroll_hpages (GtkTextView *text_view,
else if (count > 0 && adj->value >= (adj->upper - adj->page_size - 1e-12))
{
/* already at far right, just be sure we are at the end */
- gtk_text_iter_forward_to_line_end (&new_insert);
+ if (!gtk_text_iter_ends_line (&new_insert))
+ gtk_text_iter_forward_to_line_end (&new_insert);
move_cursor (text_view, &new_insert, extend_selection);
}
else