diff options
| author | Paul Eggert | 2013-07-08 22:04:45 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-07-08 22:04:45 -0700 |
| commit | cf7a0de6e75d2c510e69ab77bc70279cba7c48ba (patch) | |
| tree | 2b8255e3a883e42652f043c1097d62277d74179e | |
| parent | 5550a72cf26485d312f8cc2c1c6f49b2fbd8f667 (diff) | |
| download | emacs-cf7a0de6e75d2c510e69ab77bc70279cba7c48ba.tar.gz emacs-cf7a0de6e75d2c510e69ab77bc70279cba7c48ba.zip | |
Space between "defined" and "(".
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/image.c | 2 | ||||
| -rw-r--r-- | src/lisp.h | 2 | ||||
| -rw-r--r-- | src/nsfns.m | 6 | ||||
| -rw-r--r-- | src/nsmenu.m | 6 |
5 files changed, 9 insertions, 9 deletions
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'. */) | |||
| 1855 | /* Return the value of frame parameter PROP in frame FRAME. */ | 1855 | /* Return the value of frame parameter PROP in frame FRAME. */ |
| 1856 | 1856 | ||
| 1857 | #ifdef HAVE_WINDOW_SYSTEM | 1857 | #ifdef HAVE_WINDOW_SYSTEM |
| 1858 | #if !HAVE_NS && !defined(WINDOWSNT) | 1858 | #if !HAVE_NS && !defined (WINDOWSNT) |
| 1859 | static | 1859 | static |
| 1860 | #endif | 1860 | #endif |
| 1861 | Lisp_Object | 1861 | 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, | |||
| 8054 | 8054 | ||
| 8055 | init_color_table (); | 8055 | init_color_table (); |
| 8056 | 8056 | ||
| 8057 | #if defined(HAVE_MAGICKEXPORTIMAGEPIXELS) && ! defined(HAVE_NS) | 8057 | #if defined (HAVE_MAGICKEXPORTIMAGEPIXELS) && ! defined (HAVE_NS) |
| 8058 | if (imagemagick_render_type != 0) | 8058 | if (imagemagick_render_type != 0) |
| 8059 | { | 8059 | { |
| 8060 | /* Magicexportimage is normally faster than pixelpushing. This | 8060 | /* 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; | |||
| 3922 | extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); | 3922 | extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); |
| 3923 | extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); | 3923 | extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); |
| 3924 | extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object); | 3924 | extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object); |
| 3925 | #if HAVE_NS || defined(WINDOWSNT) | 3925 | #if HAVE_NS || defined WINDOWSNT |
| 3926 | extern Lisp_Object get_frame_param (struct frame *, Lisp_Object); | 3926 | extern Lisp_Object get_frame_param (struct frame *, Lisp_Object); |
| 3927 | #endif | 3927 | #endif |
| 3928 | extern void frames_discard_buffer (Lisp_Object); | 3928 | 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) | |||
| 885 | 885 | ||
| 886 | #ifdef NS_IMPL_GNUSTEP | 886 | #ifdef NS_IMPL_GNUSTEP |
| 887 | sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION)); | 887 | sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION)); |
| 888 | #elif defined(NS_IMPL_COCOA) | 888 | #elif defined (NS_IMPL_COCOA) |
| 889 | sprintf(tmp, "apple-appkit-%.2f", NSAppKitVersionNumber); | 889 | sprintf(tmp, "apple-appkit-%.2f", NSAppKitVersionNumber); |
| 890 | #else | 890 | #else |
| 891 | tmp = "ns-unknown"; | 891 | tmp = "ns-unknown"; |
| @@ -902,7 +902,7 @@ ns_appkit_version_int (void) | |||
| 902 | { | 902 | { |
| 903 | #ifdef NS_IMPL_GNUSTEP | 903 | #ifdef NS_IMPL_GNUSTEP |
| 904 | return GNUSTEP_GUI_MAJOR_VERSION * 100 + GNUSTEP_GUI_MINOR_VERSION; | 904 | return GNUSTEP_GUI_MAJOR_VERSION * 100 + GNUSTEP_GUI_MINOR_VERSION; |
| 905 | #elif defined(NS_IMPL_COCOA) | 905 | #elif defined (NS_IMPL_COCOA) |
| 906 | return (int)NSAppKitVersionNumber; | 906 | return (int)NSAppKitVersionNumber; |
| 907 | #endif | 907 | #endif |
| 908 | return 0; | 908 | return 0; |
| @@ -2493,7 +2493,7 @@ Internal use only, use `display-monitor-attributes-list' instead. */) | |||
| 2493 | vy = (short) (primary_display_height - | 2493 | vy = (short) (primary_display_height - |
| 2494 | vfr.size.height - vfr.origin.y); | 2494 | vfr.size.height - vfr.origin.y); |
| 2495 | } | 2495 | } |
| 2496 | 2496 | ||
| 2497 | m->geom.x = (short) fr.origin.x; | 2497 | m->geom.x = (short) fr.origin.x; |
| 2498 | m->geom.y = y; | 2498 | m->geom.y = y; |
| 2499 | m->geom.width = (unsigned short) fr.size.width; | 2499 | 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; | |||
| 612 | if (trackingMenu == 0) | 612 | if (trackingMenu == 0) |
| 613 | return; | 613 | return; |
| 614 | /*fprintf (stderr, "Updating menu '%s'\n", [[self title] UTF8String]); NSLog (@"%@\n", event); */ | 614 | /*fprintf (stderr, "Updating menu '%s'\n", [[self title] UTF8String]); NSLog (@"%@\n", event); */ |
| 615 | #if ! defined(NS_IMPL_COCOA) || \ | 615 | #if (! defined (NS_IMPL_COCOA) \ |
| 616 | MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 | 616 | || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) |
| 617 | /* Don't know how to do this for anything other than OSX >= 10.5 | 617 | /* Don't know how to do this for anything other than OSX >= 10.5 |
| 618 | This is wrong, as it might run Lisp code in the event loop. */ | 618 | This is wrong, as it might run Lisp code in the event loop. */ |
| 619 | ns_update_menubar (frame, true, self); | 619 | ns_update_menubar (frame, true, self); |
| @@ -1240,7 +1240,7 @@ update_frame_tool_bar (FRAME_PTR f) | |||
| 1240 | #ifdef NS_IMPL_GNUSTEP | 1240 | #ifdef NS_IMPL_GNUSTEP |
| 1241 | [self insertItemWithItemIdentifier: identifier atIndex: idx]; | 1241 | [self insertItemWithItemIdentifier: identifier atIndex: idx]; |
| 1242 | #endif | 1242 | #endif |
| 1243 | 1243 | ||
| 1244 | [item setTag: tag]; | 1244 | [item setTag: tag]; |
| 1245 | [item setEnabled: enabled]; | 1245 | [item setEnabled: enabled]; |
| 1246 | 1246 | ||