aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsfont.m
diff options
context:
space:
mode:
authorAdrian Robert2010-11-04 20:10:50 +0200
committerAdrian Robert2010-11-04 20:10:50 +0200
commit3fdebbf9ac5507cf112ee58613a02f73039c4e41 (patch)
treef09b005ed34cc50ee1771c0cf069a66c97ad59f3 /src/nsfont.m
parenteea682b6d1e8a2c518dc8402160bbccd999d64e7 (diff)
downloademacs-3fdebbf9ac5507cf112ee58613a02f73039c4e41.tar.gz
emacs-3fdebbf9ac5507cf112ee58613a02f73039c4e41.zip
* 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>.
Diffstat (limited to 'src/nsfont.m')
-rw-r--r--src/nsfont.m4
1 files changed, 1 insertions, 3 deletions
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,
1211 DPSstroke (context); 1211 DPSstroke (context);
1212 1212
1213 DPSgrestore (context); 1213 DPSgrestore (context);
1214 return to-from;
1215 } 1214 }
1216 1215
1217#else /* NS_IMPL_COCOA */ 1216#else /* NS_IMPL_COCOA */
@@ -1280,10 +1279,9 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
1280 } 1279 }
1281 1280
1282 CGContextRestoreGState (gcontext); 1281 CGContextRestoreGState (gcontext);
1283 return;
1284 } 1282 }
1285#endif /* NS_IMPL_COCOA */ 1283#endif /* NS_IMPL_COCOA */
1286 1284 return to-from;
1287} 1285}
1288 1286
1289 1287