Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2110
diff -u -p -r1.2110 ChangeLog
--- ChangeLog	23 Mar 2005 21:21:50 -0000	1.2110
+++ ChangeLog	24 Mar 2005 10:48:01 -0000
@@ -1,3 +1,10 @@
+2005-03-26  Yu Mengjie  <meng-jie.yu@sun.com>
+
+	* gtkhtml.c: (scroll):
+	we should not scroll gtkhtml widget if caret mode is on.
+
+	Fixes 74053
+
 2005-03-23  Radek Doulik  <rodo@novell.com>
 
 	* htmlgdkpainter.c (draw_glyphs): maintain fg color unchanged
Index: gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.594
diff -u -p -r1.594 gtkhtml.c
--- gtkhtml.c	10 Mar 2005 12:24:04 -0000	1.594
+++ gtkhtml.c	24 Mar 2005 10:48:51 -0000
@@ -4340,7 +4340,7 @@ scroll (GtkHTML *html,
 	gfloat delta;
 
 	/* we dont want scroll in editable (move cursor instead) */
-	if (html_engine_get_editable (html->engine))
+	if (html_engine_get_editable (html->engine) || html->engine->caret_mode)
 		return;
 
 	adj = (orientation == GTK_ORIENTATION_VERTICAL)
