From 16fe48b4248cd1e38a545ef35c5e9ffe9a49adb4 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 12 Oct 2004 14:14:35 +0000 Subject: [PATCH] (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. --- src/xdisp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index 1c479aee4e8..fa4ddc3eb4d 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10407,6 +10407,9 @@ redisplay_preserve_echo_area (from_where) } else redisplay_internal (1); + + if (rif->flush_display_optional) + rif->flush_display_optional (NULL); } @@ -18696,8 +18699,10 @@ calc_line_height_property (it, prop, font, boff, total) 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); -- 2.39.5