[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.915 emacs/src/xdisp.c:1.916
*** emacs/src/xdisp.c:1.915     Tue Oct 12 07:37:06 2004
--- emacs/src/xdisp.c   Tue Oct 12 14:14:35 2004
***************
*** 10407,10412 ****
--- 10407,10415 ----
      }
    else
      redisplay_internal (1);
+ 
+   if (rif->flush_display_optional)
+     rif->flush_display_optional (NULL);
  }
  
  
***************
*** 18696,18703 ****
  
    if (STRINGP (it->object))
      position = make_number (IT_STRING_CHARPOS (*it));
!   else
      position = make_number (IT_CHARPOS (*it));
  
    val = Fget_char_property (position, prop, it->object);
  
--- 18699,18708 ----
  
    if (STRINGP (it->object))
      position = make_number (IT_STRING_CHARPOS (*it));
!   else if (BUFFERP (it->object))
      position = make_number (IT_CHARPOS (*it));
+   else
+     return Qnil;
  
    val = Fget_char_property (position, prop, it->object);