bug#11119: 23.4; Xcode 4.3.2 dislikes valueless return statements in non-void functions

[Pavel Repin]

On Mar 28, 2012, at 20:58, Glenn Morris <rgm@gnu.org> wrote:

> Thanks. I looked at the patch (which is small; why not include it in
> your original report?).

My bad. The patch is pasted below.

> It seems to me that this is already fixed in the
> Emacs trunk for 24.1, by this:
>
> http://lists.gnu.org/archive/html/emacs-devel/2010-11/msg00133.html

Yes this is great it was fixed in trunk (my patch is almost identical).
Any chance it might be applied to 23.4 branch?

The patch against 23.4 tarball:

diff -ur a/src/nsfont.m b/src/nsfont.m
--- a/src/nsfont.m  2012-01-11 04:35:01.000000000 -0800
+++ b/src/nsfont.m  2012-01-11 04:35:01.000000000 -0800
@@ -1278,7 +1278,7 @@
       }

     CGContextRestoreGState (gcontext);
-    return;
+    return 0;
   }
 #endif  /* NS_IMPL_COCOA */

diff -ur a/src/nsimage.m b/src/nsimage.m
--- a/src/nsimage.m 2012-01-11 04:35:01.000000000 -0800
+++ b/src/nsimage.m 2012-01-11 04:35:01.000000000 -0800
@@ -334,7 +334,7 @@
   NSColor *rgbColor;

   if (bmRep == nil || color == nil)
-    return;
+    return nil;

   if ([color colorSpaceName] != NSCalibratedRGBColorSpace)
     rgbColor = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
diff -ur a/src/nsterm.m b/src/nsterm.m
--- a/src/nsterm.m  2012-01-11 04:35:01.000000000 -0800
+++ b/src/nsterm.m  2012-01-11 04:35:01.000000000 -0800
@@ -5431,7 +5431,7 @@
   NSTRACE (performDragOperation);

   if (!emacs_event)
-    return;
+    return NO;

   position = [self convertPoint: [sender draggingLocation] fromView: nil];
   x = lrint (position.x);  y = lrint (position.y);