Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2069
diff -u -p -r1.2069 ChangeLog
--- ChangeLog	20 Jan 2005 13:33:16 -0000	1.2069
+++ ChangeLog	21 Jan 2005 09:46:58 -0000
@@ -1,3 +1,9 @@
+2005-01-21  Mengjie Yu  <meng-jie.yu@sun.com>
+	
+	Fixes #70134
+	* gtkhtml.c: (command):
+	make Home/End navigation work properly when Caret Mode is enabled
+
 2005-01-20  Radek Doulik  <rodo@ximian.com>
 
 	* htmlengine.c (html_engine_begin): check environment variable
Index: gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.586
diff -u -p -r1.586 gtkhtml.c
--- gtkhtml.c	5 Jan 2005 07:26:24 -0000	1.586
+++ gtkhtml.c	21 Jan 2005 09:47:29 -0000
@@ -4579,11 +4579,11 @@ command (GtkHTML *html, GtkHTMLCommandTy
 			html->binding_handled = gtk_widget_child_focus (GTK_WIDGET (html), GTK_DIR_TAB_BACKWARD);
 		break;
 	case GTK_HTML_COMMAND_SCROLL_BOD:
-		if (!html_engine_get_editable (e))
+		if (!html_engine_get_editable (e) && !e->caret_mode)
 			gtk_adjustment_set_value (gtk_layout_get_vadjustment (GTK_LAYOUT (html)), 0);
 		break;
 	case GTK_HTML_COMMAND_SCROLL_EOD:
-		if (!html_engine_get_editable (e)) {
+		if (!html_engine_get_editable (e) && !e->caret_mode) {
 			GtkAdjustment *vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (html));
 			gtk_adjustment_set_value (vadj, vadj->upper - vadj->page_size);
 		}
