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

[Richard M. Stallman]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.713 emacs/src/xdisp.c:1.714
*** emacs/src/xdisp.c:1.713     Wed Dec 12 08:42:55 2001
--- emacs/src/xdisp.c   Wed Dec 12 17:27:28 2001
***************
*** 7231,7237 ****
         frame_title_ptr so that display_mode_element will output into it;
         then display the title.  */
        obuf = current_buffer;
!       Fset_buffer (XWINDOW (f->selected_window)->buffer);
        fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format;
        frame_title_ptr = frame_title_buf;
        init_iterator (&it, XWINDOW (f->selected_window), -1, -1,
--- 7231,7237 ----
         frame_title_ptr so that display_mode_element will output into it;
         then display the title.  */
        obuf = current_buffer;
!       set_buffer_internal_1 (XBUFFER (XWINDOW (f->selected_window)->buffer));
        fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format;
        frame_title_ptr = frame_title_buf;
        init_iterator (&it, XWINDOW (f->selected_window), -1, -1,
***************
*** 7239,7245 ****
        display_mode_element (&it, 0, -1, -1, fmt);
        len = frame_title_ptr - frame_title_buf;
        frame_title_ptr = NULL;
!       set_buffer_internal (obuf);
  
        /* Set the title only if it's changed.  This avoids consing in
         the common case where it hasn't.  (If it turns out that we've
--- 7239,7245 ----
        display_mode_element (&it, 0, -1, -1, fmt);
        len = frame_title_ptr - frame_title_buf;
        frame_title_ptr = NULL;
!       set_buffer_internal_1 (obuf);
  
        /* Set the title only if it's changed.  This avoids consing in
         the common case where it hasn't.  (If it turns out that we've
***************
*** 8186,8192 ****
     Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is
     cleared.  */
  
! #define CLEAR_FACE_CACHE_COUNT        10000
  static int clear_face_cache_count;
  
  /* Record the previous terminal frame we displayed.  */
--- 8186,8192 ----
     Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is
     cleared.  */
  
! #define CLEAR_FACE_CACHE_COUNT        500
  static int clear_face_cache_count;
  
  /* Record the previous terminal frame we displayed.  */
***************
*** 8813,8818 ****
--- 8813,8822 ----
          
          if (FRAME_WINDOW_P (f) || f == sf)
            {
+             if (clear_face_cache_count % 50 == 0
+                 && FRAME_WINDOW_P (f))
+               clear_image_cache (f, 0);
+ 
              /* Mark all the scroll bars to be removed; we'll redeem
                 the ones we want when we redisplay their windows.  */
              if (condemn_scroll_bars_hook)