diff options
| author | Paul Eggert | 2013-06-27 22:48:53 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-06-27 22:48:53 -0700 |
| commit | ba3de9e6abfc07d733fcb3390de0be24b02b9e23 (patch) | |
| tree | cab8b65310fca4ffff7ebff840e7631a943dbc35 /src | |
| parent | b8075603a4cb816aa44fe1b334ecb166ac7d0b5d (diff) | |
| download | emacs-ba3de9e6abfc07d733fcb3390de0be24b02b9e23.tar.gz emacs-ba3de9e6abfc07d733fcb3390de0be24b02b9e23.zip | |
* image.c (x_from_xcolors): Remove unused local.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a5e8eefbeef..e404cdbdb9f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-28 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * image.c (x_from_xcolors): Remove unused local. | ||
| 4 | |||
| 1 | 2013-06-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 5 | 2013-06-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 6 | ||
| 3 | Defer image data transfer between X client and server until actual | 7 | Defer image data transfer between X client and server until actual |
diff --git a/src/image.c b/src/image.c index 8381ce06b93..04fec52df38 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -4657,7 +4657,6 @@ x_from_xcolors (struct frame *f, struct image *img, XColor *colors) | |||
| 4657 | { | 4657 | { |
| 4658 | int x, y; | 4658 | int x, y; |
| 4659 | XImagePtr oimg = NULL; | 4659 | XImagePtr oimg = NULL; |
| 4660 | Pixmap pixmap; | ||
| 4661 | XColor *p; | 4660 | XColor *p; |
| 4662 | 4661 | ||
| 4663 | init_color_table (); | 4662 | init_color_table (); |