From: Karoly Lorentey <lorentey@elte.hu>
Date: Wed, 16 Mar 2005 16:03:44 +0000 (+0000)
Subject: Merged from miles@gnu.org--gnu-2005 (patch 160-161)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~292
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38d2de214077b4e600d9f9d20d7ec81e1f1c8908;p=emacs.git

Merged from miles@gnu.org--gnu-2005 (patch 160-161)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-160
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-161
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-308
---

38d2de214077b4e600d9f9d20d7ec81e1f1c8908
diff --cc src/xdisp.c
index 2b69e885954,9c2d3c2554d..7f7e60e81b8
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@@ -781,6 -781,17 +781,13 @@@ enum move_it_resul
  #define CLEAR_FACE_CACHE_COUNT	500
  static int clear_face_cache_count;
  
+ /* Similarly for the image cache.  */
+ 
+ #ifdef HAVE_WINDOW_SYSTEM
+ #define CLEAR_IMAGE_CACHE_COUNT	101
+ static int clear_image_cache_count;
+ #endif
+ 
 -/* Record the previous terminal frame we displayed.  */
 -
 -static struct frame *previous_terminal_frame;
 -
  /* Non-zero while redisplay_internal is in progress.  */
  
  int redisplaying_p;
@@@ -10395,16 -10402,10 +10397,10 @@@ redisplay_internal (preserve_echo_area
  		   variables.  */
  		select_frame_for_redisplay (frame);
  
- #ifdef HAVE_WINDOW_SYSTEM
- 	      if (clear_face_cache_count % 50 == 0
- 		  && FRAME_WINDOW_P (f))
- 		clear_image_cache (f, 0);
- #endif /* HAVE_WINDOW_SYSTEM */
- 
  	      /* 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)
 -		condemn_scroll_bars_hook (f);
 +	      if (FRAME_DISPLAY (f)->condemn_scroll_bars_hook)
 +		FRAME_DISPLAY (f)->condemn_scroll_bars_hook (f);
  
  	      if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
  		redisplay_windows (FRAME_ROOT_WINDOW (f));