[Emacs-diffs] /srv/bzr/emacs/trunk r102246: * nsfont.m (nsfont_draw) * nsimage.m (EmacsImage-setXBMColor:) * nsterm.m (EmacsView-performDragOperation:): Correct empty return statements. Based on a patch by Ismail Donmez <address@hidden>.

[Adrian Robert]

------------------------------------------------------------
revno: 102246
committer: Adrian Robert <address@hidden>
branch nick: trunk
timestamp: Thu 2010-11-04 20:10:50 +0200
message:
  * nsfont.m (nsfont_draw)  * nsimage.m (EmacsImage-setXBMColor:)  * nsterm.m 
(EmacsView-performDragOperation:): Correct empty return statements.  Based on a 
patch by Ismail Donmez <address@hidden>.
modified:
  src/ChangeLog
  src/nsfont.m
  src/nsimage.m
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-03 20:08:48 +0000
+++ b/src/ChangeLog     2010-11-04 18:10:50 +0000
@@ -1,3 +1,10 @@
+2010-11-04  Adrian Robert  <address@hidden>
+
+       * nsfont.m (nsfont_draw)
+       * nsimage.m (EmacsImage-setXBMColor:)
+       * nsterm.m (EmacsView-performDragOperation:): Correct empty return
+       statements.  Based on a patch by Ismail Donmez <address@hidden>.
+
 2010-11-03  Julien Danjou  <address@hidden>
 
        * image.c (gif_load): Add support for transparency and specified

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2010-08-11 08:58:56 +0000
+++ b/src/nsfont.m      2010-11-04 18:10:50 +0000
@@ -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;
 }
 
 

=== modified file 'src/nsimage.m'
--- a/src/nsimage.m     2010-09-04 19:39:34 +0000
+++ b/src/nsimage.m     2010-11-04 18:10:50 +0000
@@ -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;
 }
 
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2010-10-29 00:50:13 +0000
+++ b/src/nsterm.m      2010-11-04 18:10:50 +0000
@@ -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);