From: Paul Eggert Date: Tue, 9 Jul 2013 05:04:45 +0000 (-0700) Subject: Space between "defined" and "(". X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1878 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf7a0de6e75d2c510e69ab77bc70279cba7c48ba;p=emacs.git Space between "defined" and "(". --- diff --git a/src/frame.c b/src/frame.c index 6ecc7147c18..648687a7cb4 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1855,7 +1855,7 @@ See `redirect-frame-focus'. */) /* Return the value of frame parameter PROP in frame FRAME. */ #ifdef HAVE_WINDOW_SYSTEM -#if !HAVE_NS && !defined(WINDOWSNT) +#if !HAVE_NS && !defined (WINDOWSNT) static #endif Lisp_Object diff --git a/src/image.c b/src/image.c index 6ef3754e005..b3a52688ebd 100644 --- a/src/image.c +++ b/src/image.c @@ -8054,7 +8054,7 @@ imagemagick_load_image (struct frame *f, struct image *img, init_color_table (); -#if defined(HAVE_MAGICKEXPORTIMAGEPIXELS) && ! defined(HAVE_NS) +#if defined (HAVE_MAGICKEXPORTIMAGEPIXELS) && ! defined (HAVE_NS) if (imagemagick_render_type != 0) { /* Magicexportimage is normally faster than pixelpushing. This diff --git a/src/lisp.h b/src/lisp.h index 692f73cdbc3..c7e36fbf9de 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3922,7 +3922,7 @@ extern Lisp_Object Qvisible; extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object); -#if HAVE_NS || defined(WINDOWSNT) +#if HAVE_NS || defined WINDOWSNT extern Lisp_Object get_frame_param (struct frame *, Lisp_Object); #endif extern void frames_discard_buffer (Lisp_Object); diff --git a/src/nsfns.m b/src/nsfns.m index b8f46e461fa..6eebb4d2567 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -885,7 +885,7 @@ ns_appkit_version_str (void) #ifdef NS_IMPL_GNUSTEP sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION)); -#elif defined(NS_IMPL_COCOA) +#elif defined (NS_IMPL_COCOA) sprintf(tmp, "apple-appkit-%.2f", NSAppKitVersionNumber); #else tmp = "ns-unknown"; @@ -902,7 +902,7 @@ ns_appkit_version_int (void) { #ifdef NS_IMPL_GNUSTEP return GNUSTEP_GUI_MAJOR_VERSION * 100 + GNUSTEP_GUI_MINOR_VERSION; -#elif defined(NS_IMPL_COCOA) +#elif defined (NS_IMPL_COCOA) return (int)NSAppKitVersionNumber; #endif return 0; @@ -2493,7 +2493,7 @@ Internal use only, use `display-monitor-attributes-list' instead. */) vy = (short) (primary_display_height - vfr.size.height - vfr.origin.y); } - + m->geom.x = (short) fr.origin.x; m->geom.y = y; m->geom.width = (unsigned short) fr.size.width; diff --git a/src/nsmenu.m b/src/nsmenu.m index 1d3d111e9a1..22635dca0a2 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -612,8 +612,8 @@ extern NSString *NSMenuDidBeginTrackingNotification; if (trackingMenu == 0) return; /*fprintf (stderr, "Updating menu '%s'\n", [[self title] UTF8String]); NSLog (@"%@\n", event); */ -#if ! defined(NS_IMPL_COCOA) || \ - MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +#if (! defined (NS_IMPL_COCOA) \ + || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) /* Don't know how to do this for anything other than OSX >= 10.5 This is wrong, as it might run Lisp code in the event loop. */ ns_update_menubar (frame, true, self); @@ -1240,7 +1240,7 @@ update_frame_tool_bar (FRAME_PTR f) #ifdef NS_IMPL_GNUSTEP [self insertItemWithItemIdentifier: identifier atIndex: idx]; #endif - + [item setTag: tag]; [item setEnabled: enabled];