* nsfont.m (nsfont_draw) * nsimage.m (EmacsImage-setXBMColor:) * nsterm.m (EmacsVie...

diff --git a/src/ChangeLog b/src/ChangeLog
index efb2cccb3f14c1a7cac1a7b339372437e1b2c6f5..8672628743e3ab563b80eba0e6bcc1df50a6a6bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/nsfont.m b/src/nsfont.m
index 115986774d83f8a6265e27c96636a07762e31e4b..63b94a1b67adfcc3ccae9c31ab8dd5ab6d0616bf 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -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;
 }
 
 

diff --git a/src/nsimage.m b/src/nsimage.m
index a42950d1f5206ec96fb6f9c5b616c1233cf07594..81198be08623fe5f220b78dc027c482a4f20e2f5 100644 (file)
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -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;
 }
 
 

diff --git a/src/nsterm.m b/src/nsterm.m
index f11c477d19272df62c43a11e1b518f65ae184221..2fd82a0cf9beb394acb093cd07e5a349c69e5282 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -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);