diff --git a/src/ChangeLog b/src/ChangeLog
index e573b9d2f2e..ff7a6c65abb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-25  Gerd Moellmann  <gerd@gnu.org>
 
+	* xdisp.c (redisplay_internal) <update one window>: Make sure
+	last_arrow_position and last_arrow_string are set.
+
 	* frame.c (Fframe_list): Don't return a tooltip frame.
 
 2001-03-23  Gerd Moellmann  <gerd@gnu.org>
diff --git a/src/xdisp.c b/src/xdisp.c
index f467ef9671d..b40d944b30f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8717,6 +8717,10 @@ redisplay_internal (preserve_echo_area)
 	  /* This has already been done above if
 	     consider_all_windows_p is set.  */
 	  mark_window_display_accurate_1 (w, 1);
+	  
+	  last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
+	  last_arrow_string = Voverlay_arrow_string;
+	  
 	  if (frame_up_to_date_hook != 0)
 	    frame_up_to_date_hook (sf);
 	}