# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1288894250 -7200
# Node ID 4afa0b625189cf16c442f521b9f2f0c103e1c4f3
# Parent  ee55b66205946cf2e6970b7682c64d08ad9179e5
* 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>.

diff -r ee55b6620594 -r 4afa0b625189 src/ChangeLog
--- a/src/ChangeLog	Thu Nov 04 13:00:43 2010 -0400
+++ b/src/ChangeLog	Thu Nov 04 20:10:50 2010 +0200
@@ -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
diff -r ee55b6620594 -r 4afa0b625189 src/nsfont.m
--- a/src/nsfont.m	Thu Nov 04 13:00:43 2010 -0400
+++ b/src/nsfont.m	Thu Nov 04 20:10:50 2010 +0200
@@ -1211,7 +1211,6 @@
     DPSstroke (context);
 
     DPSgrestore (context);
-    return to-from;
   }
 
 #else  /* NS_IMPL_COCOA */
@@ -1280,10 +1279,9 @@
       }
 
     CGContextRestoreGState (gcontext);
-    return;
   }
 #endif  /* NS_IMPL_COCOA */
-
+  return to-from;
 }
 
 
diff -r ee55b6620594 -r 4afa0b625189 src/nsimage.m
--- a/src/nsimage.m	Thu Nov 04 13:00:43 2010 -0400
+++ b/src/nsimage.m	Thu Nov 04 20:10:50 2010 +0200
@@ -336,7 +336,7 @@
   NSColor *rgbColor;
 
   if (bmRep == nil || color == nil)
-    return;
+    return self;
 
   if ([color colorSpaceName] != NSCalibratedRGBColorSpace)
     rgbColor = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
@@ -361,6 +361,8 @@
           planes[2][i] = bb;
         }
   }
+
+  return self;
 }
 
 
diff -r ee55b6620594 -r 4afa0b625189 src/nsterm.m
--- a/src/nsterm.m	Thu Nov 04 13:00:43 2010 -0400
+++ b/src/nsterm.m	Thu Nov 04 20:10:50 2010 +0200
@@ -5436,7 +5436,7 @@
   NSTRACE (performDragOperation);
 
   if (!emacs_event)
-    return;
+    return NO;
 
   position = [self convertPoint: [sender draggingLocation] fromView: nil];
   x = lrint (position.x);  y = lrint (position.y);