diff --git a/ChangeLog b/ChangeLog
index a7fc45a3e8..da2f8fdba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct  4 21:07:07 BST 1998 Adam D. Moss <adam@gimp.org>
+
+	* app/ink.c app/paint_core.c: The paint and ink tools
+	are synchronous.
+
 Sat Oct  3 21:01:34 BST 1998 Adam D. Moss <adam@gimp.org>
 
 	* app/channel.c app/channel_ops.c app/disp_callbacks.c
diff --git a/app/ink.c b/app/ink.c
index 062816791a..81c070f963 100644
--- a/app/ink.c
+++ b/app/ink.c
@@ -475,7 +475,7 @@ ink_button_press (Tool           *tool,
   ink_paste (ink_tool, drawable, b);
   ink_tool->last_blob = b;
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
@@ -531,7 +531,7 @@ ink_motion (Tool           *tool,
   ink_paste (ink_tool, drawable, blob_union);  
   g_free (blob_union);
   
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c
index 062816791a..81c070f963 100644
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@@ -475,7 +475,7 @@ ink_button_press (Tool           *tool,
   ink_paste (ink_tool, drawable, b);
   ink_tool->last_blob = b;
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
@@ -531,7 +531,7 @@ ink_motion (Tool           *tool,
   ink_paste (ink_tool, drawable, blob_union);  
   g_free (blob_union);
   
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
diff --git a/app/paint_core.c b/app/paint_core.c
index 30fb85e5a2..35d14458ea 100644
--- a/app/paint_core.c
+++ b/app/paint_core.c
@@ -209,7 +209,7 @@ paint_core_button_press (tool, bevent, gdisp_ptr)
   else
     (* paint_core->paint_func) (paint_core, drawable, MOTION_PAINT);
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 void
@@ -263,7 +263,7 @@ paint_core_motion (tool, mevent, gdisp_ptr)
 
   paint_core_interpolate (paint_core, gimage_active_drawable (gdisp->gimage));
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 
   paint_core->lastx = paint_core->curx;
   paint_core->lasty = paint_core->cury;
diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c
index 062816791a..81c070f963 100644
--- a/app/tools/gimpinktool.c
+++ b/app/tools/gimpinktool.c
@@ -475,7 +475,7 @@ ink_button_press (Tool           *tool,
   ink_paste (ink_tool, drawable, b);
   ink_tool->last_blob = b;
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
@@ -531,7 +531,7 @@ ink_motion (Tool           *tool,
   ink_paste (ink_tool, drawable, blob_union);  
   g_free (blob_union);
   
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
diff --git a/app/tools/ink.c b/app/tools/ink.c
index 062816791a..81c070f963 100644
--- a/app/tools/ink.c
+++ b/app/tools/ink.c
@@ -475,7 +475,7 @@ ink_button_press (Tool           *tool,
   ink_paste (ink_tool, drawable, b);
   ink_tool->last_blob = b;
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
@@ -531,7 +531,7 @@ ink_motion (Tool           *tool,
   ink_paste (ink_tool, drawable, blob_union);  
   g_free (blob_union);
   
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 static void
diff --git a/app/tools/paint_core.c b/app/tools/paint_core.c
index 30fb85e5a2..35d14458ea 100644
--- a/app/tools/paint_core.c
+++ b/app/tools/paint_core.c
@@ -209,7 +209,7 @@ paint_core_button_press (tool, bevent, gdisp_ptr)
   else
     (* paint_core->paint_func) (paint_core, drawable, MOTION_PAINT);
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 }
 
 void
@@ -263,7 +263,7 @@ paint_core_motion (tool, mevent, gdisp_ptr)
 
   paint_core_interpolate (paint_core, gimage_active_drawable (gdisp->gimage));
 
-  gdisplay_flush (gdisp);
+  gdisplay_flush_now (gdisp);
 
   paint_core->lastx = paint_core->curx;
   paint_core->lasty = paint_core->cury;