From 09797d31cf4b9f5428ea16b2ffe721a384e1b007 Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Wed, 9 May 2001 18:11:04 +0000
Subject: [PATCH] Ctrl-Home / Ctrl-End have proper cursor navigation

---
 ChangeLog.claws |  6 ++++++
 src/gtkstext.c  | 26 ++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 03a03082f..e040e7864 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,10 @@
+2001-05-09 [alfons]
+
+	* src/gtkstext.c:
+		Ctrl-Home / Ctrl-End have proper cursor navigation
+
 2001-05-09 [hoa]
+
 	* src/prefs_matcher.c
 		finished UI to define matching properties
 		added ok and cancel button
diff --git a/src/gtkstext.c b/src/gtkstext.c
index a46b3def0..e4ca82ff1 100644
--- a/src/gtkstext.c
+++ b/src/gtkstext.c
@@ -2189,8 +2189,17 @@ gtk_stext_key_press (GtkWidget   *widget,
       switch (event->keyval)
 	{
 	case GDK_Home:
-	  if (event->state & GDK_CONTROL_MASK)
-	    move_cursor_buffer_ver (text, -1);
+	  if (event->state & GDK_CONTROL_MASK) {
+		if (text->wrap_rmargin == 0) {
+			/* SYLPHEED: old behaviour */
+			move_cursor_buffer_ver (text, -1);
+		}
+		else {
+			/* SYLPHEED: contrived, but "trusty" */
+			move_cursor_buffer_ver(text, -1);
+			move_cursor_to_display_row_start(text);
+		}
+	  }	
 	  else {
 		if (text->wrap_rmargin > 0) {
 			/* SYLPHEED: line start */
@@ -2202,8 +2211,17 @@ gtk_stext_key_press (GtkWidget   *widget,
 	  }	
 	  break;
 	case GDK_End:
-	  if (event->state & GDK_CONTROL_MASK)
-	    move_cursor_buffer_ver (text, +1);
+	  if (event->state & GDK_CONTROL_MASK) {
+		/* SYLPHEED: a little bit contrived... */
+		if (text->wrap_rmargin == 0) {
+			/* old behaviour */
+			move_cursor_buffer_ver (text, +1);
+		}
+		else {
+			move_cursor_buffer_ver(text, +1);
+			move_cursor_to_display_row_end(text);
+		}
+	  }		
 	  else {
 		if (text->wrap_rmargin > 0) {
 			/* SYLPHEED: line end */
-- 
2.25.1