diff options
| author | Paul Eggert | 2012-07-07 12:23:41 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-07 12:23:41 -0700 |
| commit | 6045c4fdb88ee6bd84afcaac4a0b7e8a96f23050 (patch) | |
| tree | 86959a892e16b2947b794a6ad993f0090387fab3 /src/nsselect.m | |
| parent | 41f9404e0cb421fcea07538bbd686d54200ed92d (diff) | |
| download | emacs-6045c4fdb88ee6bd84afcaac4a0b7e8a96f23050.tar.gz emacs-6045c4fdb88ee6bd84afcaac4a0b7e8a96f23050.zip | |
Improve static checking when configured --with-ns.
See Samuel Bronson's remarks in
<http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00146.html>.
* configure.in (WARN_CFLAGS): Omit -Wunreachable-code, as it's
a no-op with recent GCC and harmful in earlier ones.
Omit -Wsync-nand, as it's irrelevant to Emacs and provokes a
warning when compiling with ObjC. Always omit
-Wunsafe-loop-optimizations, as we don't mind when optimization is
being done correctly.
Fix some minor --with-ns problems found by static checking.
* src/frame.c (Ftool_bar_pixel_width) [!FRAME_TOOLBAR_WIDTH]:
(x_set_font) [!HAVE_X_WINDOWS]:
* src/image.c (xpm_load_image) [HAVE_NS]:
(x_to_xcolors) [!HAVE_X_WINDOWS && !HAVE_NTGUI]:
(x_disable_image) [!HAVE_NS && !HAVE_NTGUI]:
Remove unused local.
(Fx_parse_geometry) [HAVE_NS]: Don't return garbage.
(xpm_load_image) [HAVE_NS && !HAVE_XPM]: Remove unused label.
* src/image.c (x_create_bitmap_from_file) [HAVE_NS]:
(xpm_load_image, xpm_load) [HAVE_NS && !HAVE_XPM]:
* src/nsselect.m (symbol_to_nsstring, ns_string_to_pasteboard_internal):
* src/xfaces.c (Fx_load_color_file) [!HAVE_X_WINDOWS]:
Fix pointer signedness problem.
* src/xfaces.c (FRAME_X_FONT_TABLE):
* src/xterm.h (FRAME_X_FONT_TABLE): Remove unused, incompatible macros.
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index 6352d882b7a..a4d91dae1f2 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -62,7 +62,7 @@ symbol_to_nsstring (Lisp_Object sym) | |||
| 62 | if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; | 62 | if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; |
| 63 | if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; | 63 | if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; |
| 64 | if (EQ (sym, QTEXT)) return NSStringPboardType; | 64 | if (EQ (sym, QTEXT)) return NSStringPboardType; |
| 65 | return [NSString stringWithUTF8String: SDATA (XSYMBOL (sym)->xname)]; | 65 | return [NSString stringWithUTF8String: SSDATA (XSYMBOL (sym)->xname)]; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | static NSPasteboard * | 68 | static NSPasteboard * |
| @@ -157,7 +157,7 @@ ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype) | |||
| 157 | 157 | ||
| 158 | CHECK_STRING (str); | 158 | CHECK_STRING (str); |
| 159 | 159 | ||
| 160 | utfStr = SDATA (str); | 160 | utfStr = SSDATA (str); |
| 161 | nsStr = [[NSString alloc] initWithBytesNoCopy: utfStr | 161 | nsStr = [[NSString alloc] initWithBytesNoCopy: utfStr |
| 162 | length: SBYTES (str) | 162 | length: SBYTES (str) |
| 163 | encoding: NSUTF8StringEncoding | 163 | encoding: NSUTF8StringEncoding |
| @@ -388,7 +388,7 @@ On Nextstep, FRAME is unused. */) | |||
| 388 | for (rest = Vns_sent_selection_hooks; CONSP (rest); rest = Fcdr (rest)) | 388 | for (rest = Vns_sent_selection_hooks; CONSP (rest); rest = Fcdr (rest)) |
| 389 | call3 (Fcar (rest), selection, target_symbol, successful_p); | 389 | call3 (Fcar (rest), selection, target_symbol, successful_p); |
| 390 | } | 390 | } |
| 391 | 391 | ||
| 392 | return value; | 392 | return value; |
| 393 | } | 393 | } |
| 394 | 394 | ||
| @@ -443,7 +443,7 @@ On Nextstep, TERMINAL is unused. */) | |||
| 443 | if (EQ (selection, Qt)) selection = QSECONDARY; | 443 | if (EQ (selection, Qt)) selection = QSECONDARY; |
| 444 | pb = ns_symbol_to_pb (selection); | 444 | pb = ns_symbol_to_pb (selection); |
| 445 | if (pb == nil) return Qnil; | 445 | if (pb == nil) return Qnil; |
| 446 | 446 | ||
| 447 | types = [pb types]; | 447 | types = [pb types]; |
| 448 | return ([types count] == 0) ? Qnil : Qt; | 448 | return ([types count] == 0) ? Qnil : Qt; |
| 449 | } | 449 | } |