From d1a5744de011dca994907682bf8279a850fc9f5f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 4 Oct 2008 18:54:20 +0000 Subject: [PATCH] Fix case of "GNUstep". --- admin/CPP-DEFINES | 2 +- src/ChangeLog | 6 +++--- src/nsfns.m | 2 +- src/nsterm.m | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 874058ce0fd..a737a9d6caf 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -20,7 +20,7 @@ DARWIN_OS Compiling on Mac OS X or pure Darwin (and using s/darwin.h). HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars. HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep. -NS_IMPL_GNUSTEP Compile support for GNUSTEP implementation of NS GUI API. +NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API. NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. HAVE_X11 Compile support for the X11 GUI. HAVE_X_WINDOWS Compile support for X Window system diff --git a/src/ChangeLog b/src/ChangeLog index 46f8ab3b60e..7989621632a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1298,10 +1298,10 @@ * nsfns.m (ns_frame_parm_handlers): Add empty entry for x_set_alpha. - * nsterm.m (EmacsApp -application:openFiles:): GNUStep does not + * nsterm.m (EmacsApp -application:openFiles:): GNUstep does not define NSApplicationDelegateReplySuccess. (EmacsView -converstationIdentifier): Use long instead of - NSInteger for GNUStep, since it doesn't have NSInteger. + NSInteger for GNUstep, since it doesn't have NSInteger. * xmenu.c: Revert last change. @@ -1741,7 +1741,7 @@ * Makefile.in (C_SWITCH_SITE, LD_SWITCH_SITE): Remove, unused. Remove all references. - (temacs): Add GNUStep specific ld flags. + (temacs): Add GNUstep specific ld flags. * nsterm.m (syms_of_nsterm): Provide ns, not ns-windowing, similarly to what X does. diff --git a/src/nsfns.m b/src/nsfns.m index 2c55f969c84..f14851b698f 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1592,7 +1592,7 @@ See also the function `ns-server-vendor'. */) (display) Lisp_Object display; { - /* FIXME: return GUI version on GNUSTEP, ?? on OS X */ + /* FIXME: return GUI version on GNUstep, ?? on OS X */ return build_string ("1.0"); } diff --git a/src/nsterm.m b/src/nsterm.m index 78d0ba1dfbc..245dff4930e 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -838,7 +838,7 @@ ns_ring_bell () r.origin.y += (r.size.height - dim.y) / 2; r.size.width = dim.x; r.size.height = dim.y; - /* XXX: cacheImageInRect under GNUSTEP does not account for + /* XXX: cacheImageInRect under GNUstep does not account for offset in x_set_window_size, so overestimate (4 fine on Cocoa) */ surr = NSInsetRect (r, -10, -10); ns_focus (frame, &surr, 1); -- 2.39.5