diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-15 06:45:03 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-15 06:45:03 +0400 |
| commit | 47c4d1e97eaecc0a3d7bdb2114ef3b92fa3e5e01 (patch) | |
| tree | c666977e5643e6f6d501dba34c17632681c29c46 /src | |
| parent | 1bd9995dc0e971d289f829316fe778391c43b943 (diff) | |
| download | emacs-47c4d1e97eaecc0a3d7bdb2114ef3b92fa3e5e01.tar.gz | |
* nsterm.h (struct ns_display_info): Remove set-but-unused
member image_cache (image caches are per-terminal anyway).
(FRAME_X_IMAGE_CACHE): Remove.
* nsterm.m (ns_initialize_display_info): Adjust user.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/nsterm.h | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0349cc8b9b0..e3d42d093e5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-10-15 Dmitry Antipov <dmantipov@yandex.ru> + + * nsterm.h (struct ns_display_info): Remove set-but-unused + member image_cache (image caches are per-terminal anyway). + (FRAME_X_IMAGE_CACHE): Remove. + * nsterm.m (ns_initialize_display_info): Adjust user. + 2013-10-14 Eli Zaretskii <eliz@gnu.org> * w32proc.c: Include mingw_time.h. diff --git a/src/nsterm.h b/src/nsterm.h index 263b85d6cf1..a4e9519daae 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -569,8 +569,6 @@ struct ns_display_info ptrdiff_t bitmaps_size; ptrdiff_t bitmaps_last; - struct image_cache *image_cache; - struct ns_color_table *color_table; /* DPI resolution of this screen */ @@ -714,8 +712,6 @@ struct x_output #define FRAME_FOREGROUND_COLOR(f) ((f)->output_data.ns->foreground_color) #define FRAME_BACKGROUND_COLOR(f) ((f)->output_data.ns->background_color) -#define FRAME_X_IMAGE_CACHE(F) FRAME_DISPLAY_INFO ((F))->image_cache - #define NS_FACE_FOREGROUND(f) ((f)->foreground) #define NS_FACE_BACKGROUND(f) ((f)->background) #define FRAME_NS_TITLEBAR_HEIGHT(f) ((f)->output_data.ns->titlebar_height) diff --git a/src/nsterm.m b/src/nsterm.m index b0067d85eae..5b48ff2cee6 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3975,7 +3975,6 @@ ns_initialize_display_info (struct ns_display_info *dpyinfo) && ![NSCalibratedWhiteColorSpace isEqualToString: NSColorSpaceFromDepth (depth)]; dpyinfo->n_planes = NSBitsPerPixelFromDepth (depth); - dpyinfo->image_cache = make_image_cache (); dpyinfo->color_table = xmalloc (sizeof *dpyinfo->color_table); dpyinfo->color_table->colors = NULL; dpyinfo->root_window = 42; /* a placeholder.. */ |