mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00
Code Issues Projects Releases Wiki Activity

* nsfont.m (nsfont_draw) * nsimage.m (EmacsImage-setXBMColor:) * nsterm.m (EmacsView-performDragOperation:): Correct empty return statements. Based on a patch by Ismail Donmez <ismail@namtrac.org>.

Browse source
This commit is contained in:
Adrian Robert 2010-11-04 20:10:50 +02:00
parent eea682b6d1
commit 3fdebbf9ac
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2010-11-04 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfont.m (nsfont_draw)
* nsimage.m (EmacsImage-setXBMColor:)
* nsterm.m (EmacsView-performDragOperation:): Correct empty return
statements. Based on a patch by Ismail Donmez <ismail@namtrac.org>.
2010-11-03 Julien Danjou <julien@danjou.info>
* image.c (gif_load): Add support for transparency and specified

4
src/nsfont.m
View file

@ -1211,7 +1211,6 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
DPSstroke (context);
DPSgrestore (context);
return to-from;
}
#else /* NS_IMPL_COCOA */
@ -1280,10 +1279,9 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
}
CGContextRestoreGState (gcontext);
return;
}
#endif /* NS_IMPL_COCOA */
return to-from;
}

4
src/nsimage.m
View file

@ -336,7 +336,7 @@ static EmacsImage *ImageList = nil;
NSColor *rgbColor;
if (bmRep == nil || color == nil)
return;
return self;
if ([color colorSpaceName] != NSCalibratedRGBColorSpace)
rgbColor = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
@ -361,6 +361,8 @@ static EmacsImage *ImageList = nil;
planes[2][i] = bb;
}
}
return self;
}

2
src/nsterm.m
View file

@ -5436,7 +5436,7 @@ ns_term_shutdown (int sig)
NSTRACE (performDragOperation);
if (!emacs_event)
return;
return NO;
position = [self convertPoint: [sender draggingLocation] fromView: nil];
x = lrint (position.x); y = lrint (position.y);