Mercurial > emacs

changeset 57455:e23b8a42ded3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Kim F. Storm <storm@cua.dk>
date Tue, 12 Oct 2004 14:14:35 +0000
parents 926582f79d3b
children cadf61c7f4eb
files src/xdisp.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);