diff options
| author | Stefan Monnier | 2009-04-13 18:45:12 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-04-13 18:45:12 +0000 |
| commit | 86fa089ec05c413bb2c30dd06cce852ec917bc51 (patch) | |
| tree | 7c45b99ca3cce7923b7e17ea6953db13a41fee08 /src/nsimage.m | |
| parent | 96d98c408ae64c98f71ef34a9d91797fac71c13e (diff) | |
| download | emacs-86fa089ec05c413bb2c30dd06cce852ec917bc51.tar.gz emacs-86fa089ec05c413bb2c30dd06cce852ec917bc51.zip | |
* nsselect.m (symbol_to_nsstring, clean_local_selection_data)
(ns_string_to_pasteboard_internal):
* nsmenu.m (process_dialog):
* nsimage.m (ns_load_image): Use SDATA and ASET where appropriate.
* nsfont.m (nsfont_open): Use XHASH to make it compile with LISP_UNION.
* lisp.h (Fx_load_color_file): Declare.
Diffstat (limited to 'src/nsimage.m')
| -rw-r--r-- | src/nsimage.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsimage.m b/src/nsimage.m index c95ad09addd..9ef7ad37a0f 100644 --- a/src/nsimage.m +++ b/src/nsimage.m | |||
| @@ -93,7 +93,7 @@ ns_load_image (struct frame *f, struct image *img, | |||
| 93 | } | 93 | } |
| 94 | else | 94 | else |
| 95 | { | 95 | { |
| 96 | NSData *data = [NSData dataWithBytes: XSTRING (spec_data)->data | 96 | NSData *data = [NSData dataWithBytes: SDATA (spec_data) |
| 97 | length: SBYTES (spec_data)]; | 97 | length: SBYTES (spec_data)]; |
| 98 | eImg = [[EmacsImage alloc] initWithData: data]; | 98 | eImg = [[EmacsImage alloc] initWithData: data]; |
| 99 | [eImg setPixmapData]; | 99 | [eImg setPixmapData]; |