diff options
| author | Dmitry Antipov | 2013-10-15 06:45:03 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-10-15 06:45:03 +0400 |
| commit | 47c4d1e97eaecc0a3d7bdb2114ef3b92fa3e5e01 (patch) | |
| tree | c666977e5643e6f6d501dba34c17632681c29c46 /src | |
| parent | 1bd9995dc0e971d289f829316fe778391c43b943 (diff) | |
| download | emacs-47c4d1e97eaecc0a3d7bdb2114ef3b92fa3e5e01.tar.gz emacs-47c4d1e97eaecc0a3d7bdb2114ef3b92fa3e5e01.zip | |
* 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 @@ | |||
| 1 | 2013-10-15 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * nsterm.h (struct ns_display_info): Remove set-but-unused | ||
| 4 | member image_cache (image caches are per-terminal anyway). | ||
| 5 | (FRAME_X_IMAGE_CACHE): Remove. | ||
| 6 | * nsterm.m (ns_initialize_display_info): Adjust user. | ||
| 7 | |||
| 1 | 2013-10-14 Eli Zaretskii <eliz@gnu.org> | 8 | 2013-10-14 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * w32proc.c: Include mingw_time.h. | 10 | * 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 | |||
| 569 | ptrdiff_t bitmaps_size; | 569 | ptrdiff_t bitmaps_size; |
| 570 | ptrdiff_t bitmaps_last; | 570 | ptrdiff_t bitmaps_last; |
| 571 | 571 | ||
| 572 | struct image_cache *image_cache; | ||
| 573 | |||
| 574 | struct ns_color_table *color_table; | 572 | struct ns_color_table *color_table; |
| 575 | 573 | ||
| 576 | /* DPI resolution of this screen */ | 574 | /* DPI resolution of this screen */ |
| @@ -714,8 +712,6 @@ struct x_output | |||
| 714 | #define FRAME_FOREGROUND_COLOR(f) ((f)->output_data.ns->foreground_color) | 712 | #define FRAME_FOREGROUND_COLOR(f) ((f)->output_data.ns->foreground_color) |
| 715 | #define FRAME_BACKGROUND_COLOR(f) ((f)->output_data.ns->background_color) | 713 | #define FRAME_BACKGROUND_COLOR(f) ((f)->output_data.ns->background_color) |
| 716 | 714 | ||
| 717 | #define FRAME_X_IMAGE_CACHE(F) FRAME_DISPLAY_INFO ((F))->image_cache | ||
| 718 | |||
| 719 | #define NS_FACE_FOREGROUND(f) ((f)->foreground) | 715 | #define NS_FACE_FOREGROUND(f) ((f)->foreground) |
| 720 | #define NS_FACE_BACKGROUND(f) ((f)->background) | 716 | #define NS_FACE_BACKGROUND(f) ((f)->background) |
| 721 | #define FRAME_NS_TITLEBAR_HEIGHT(f) ((f)->output_data.ns->titlebar_height) | 717 | #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) | |||
| 3975 | && ![NSCalibratedWhiteColorSpace isEqualToString: | 3975 | && ![NSCalibratedWhiteColorSpace isEqualToString: |
| 3976 | NSColorSpaceFromDepth (depth)]; | 3976 | NSColorSpaceFromDepth (depth)]; |
| 3977 | dpyinfo->n_planes = NSBitsPerPixelFromDepth (depth); | 3977 | dpyinfo->n_planes = NSBitsPerPixelFromDepth (depth); |
| 3978 | dpyinfo->image_cache = make_image_cache (); | ||
| 3979 | dpyinfo->color_table = xmalloc (sizeof *dpyinfo->color_table); | 3978 | dpyinfo->color_table = xmalloc (sizeof *dpyinfo->color_table); |
| 3980 | dpyinfo->color_table->colors = NULL; | 3979 | dpyinfo->color_table->colors = NULL; |
| 3981 | dpyinfo->root_window = 42; /* a placeholder.. */ | 3980 | dpyinfo->root_window = 42; /* a placeholder.. */ |