# HG changeset patch
# User john.cylee@gmail.com
# Date 1248945258 -28800
# Node ID 76b61d4472258b9ef98f0639f56b7afa19c37faa
# Parent  94477e7d981e22a776e40be2bd5128b2369a4dd7# Parent  254854ed479c7a1e0a677971d6406fe8143e774e
merge upstream

diff -r 254854ed479c -r 76b61d447225 configure.ac
--- a/configure.ac	Thu Jul 30 15:42:47 2009 +0800
+++ b/configure.ac	Thu Jul 30 17:14:18 2009 +0800
@@ -36,7 +36,7 @@
 AC_CHECK_FUNCS([gettimeofday memset select sqrt strdup])
 
 AC_ARG_ENABLE([testcase],
-	[--enable-testcase	Turn on sh_text],
+	[--enable-testcase	Enable testcase],
 [case "${enableval}" in
   yes) testcase=true ;;
   no) testcase=false ;;
diff -r 254854ed479c -r 76b61d447225 src/redraw_man.c
--- a/src/redraw_man.c	Thu Jul 30 15:42:47 2009 +0800
+++ b/src/redraw_man.c	Thu Jul 30 17:14:18 2009 +0800
@@ -2025,6 +2025,8 @@
     r = draw_coord_shapes_in_dirty_areas(rdman, coord);
     
     reset_clip(canvas);
+
+    return OK;
 }
 
 static void draw_shapes_in_dirty_areas(redraw_man_t *rdman) {