mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-05 08:53:45 +00:00
Code Issues Releases Activity

(redisplay_preserve_echo_area): Flush display in case

Browse Source 
caller, such as call-process, is not going to poll for input.
(calc_line_height_property): Handle case where it->object is nil.
This commit is contained in:
Kim F. Storm 2004-10-12 14:14:35 +00:00
parent 61087d3fd6
commit 16fe48b424
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xdisp.c
View File

@ -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);