# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1097590475 0
# Node ID e23b8a42ded34826ecd90962a847a9fe81b309b7
# Parent  926582f79d3ba8b8ecc6af0b856183169bb26e72
(redisplay_preserve_echo_area): Flush display in case
caller, such as call-process, is not going to poll for input.
(calc_line_height_property): Handle case where it->object is nil.

diff -r 926582f79d3b -r e23b8a42ded3 src/xdisp.c
--- a/src/xdisp.c	Tue Oct 12 14:14:07 2004 +0000
+++ b/src/xdisp.c	Tue Oct 12 14:14:35 2004 +0000
@@ -10407,6 +10407,9 @@
     }
   else
     redisplay_internal (1);
+
+  if (rif->flush_display_optional)
+    rif->flush_display_optional (NULL);
 }
 
 
@@ -18696,8 +18699,10 @@
 
   if (STRINGP (it->object))
     position = make_number (IT_STRING_CHARPOS (*it));
-  else
+  else if (BUFFERP (it->object))
     position = make_number (IT_CHARPOS (*it));
+  else
+    return Qnil;
 
   val = Fget_char_property (position, prop, it->object);