diff options
| author | Stefan Monnier <[email protected]> | 2008-02-22 17:42:09 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2008-02-22 17:42:09 +0000 |
| commit | 354884c46ee708a22b0372d2092256408b485c8d (patch) | |
| tree | 03802c0c4e44d3ecd4b096cada74b8abf811ce29 /src/xdisp.c | |
| parent | c2e426903cfd93202e302471a6e1b265a08e8368 (diff) | |
Consolidate the image_cache to the terminal struct.
* termhooks.h (P_): Remove redundant def.
(struct terminal): New field `image_cache'.
* frame.h (FRAME_IMAGE_CACHE): New macro. Use it everywhere in place
of FRAME_X_IMAGE_CACHE.
* xterm.h (struct x_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* w32term.h (struct w32_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* macterm.h (struct mac_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* xterm.c (x_term_init):
* w32term.c (w32_term_init):
* macterm.c (mac_term_init): Set the image_cache in the terminal.
* dispextern.h (clear_image_cache, forall_images_in_image_cache):
Remove declarations.
(clear_image_caches, mark_image_cache): New declarations.
* xfaces.c (clear_face_cache):
* xdisp.c (redisplay_internal): Use clear_image_caches.
* image.c (clear_image_cache): Don't check that a frame is on
a window-system before checking if it shares the same cache.
(clear_image_caches): New function.
(Fclear_image_cache): Use it.
(mark_image): Move from allo.c.
(mark_image_cache): Move from alloc.c and forall_images_in_image_cache.
* alloc.c (mark_image, mark_image_cache): Move to image.c.
(mark_object): Don't call mark_image_cache for frames.
(mark_terminals): Call mark_image_cache.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index f9333b4282..2006274489 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11797,13 +11797,7 @@ redisplay_internal (preserve_echo_area) #ifdef HAVE_WINDOW_SYSTEM if (clear_image_cache_count > CLEAR_IMAGE_CACHE_COUNT) { - Lisp_Object tail, frame; - FOR_EACH_FRAME (tail, frame) - { - struct frame *f = XFRAME (frame); - if (FRAME_WINDOW_P (f)) - clear_image_cache (f, 0); - } + clear_image_caches (0); clear_image_cache_count = 0; } #endif /* HAVE_WINDOW_SYSTEM */ |