diff options
| -rw-r--r-- | src/xdisp.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |