From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Thu, 4 Nov 2010 18:10:50 +0000 (+0200)
Subject: * nsfont.m (nsfont_draw)  * nsimage.m (EmacsImage-setXBMColor:)  * nsterm.m (EmacsVie... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~385
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3fdebbf9ac5507cf112ee58613a02f73039c4e41;p=emacs.git

* 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 --git a/src/ChangeLog b/src/ChangeLog
index efb2cccb3f1..8672628743e 100644
--- 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 115986774d8..63b94a1b67a 100644
--- 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 a42950d1f52..81198be0862 100644
--- 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 f11c477d192..2fd82a0cf9b 100644
--- 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);