2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 830666ec99b..217a8b3d269 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (windowDidExitFullScreen:):
+        (toggleFullScreen:): Change NS_IMPL_COCOA to HAVE_NATIVE_FS.
+
 2013-10-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix race where emacs aborts when sent SIGTERM (Bug#15534).
diff --git a/src/nsterm.m b/src/nsterm.m
index f166aba2e1a..ce8d9b2106a 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6160,7 +6160,7 @@ if (cols > 0 && rows > 0)
 {
   [self setFSValue: fs_before_fs];
   fs_before_fs = -1;
-#ifdef NS_IMPL_COCOA
+#ifdef HAVE_NATIVE_FS
   [self updateCollectionBehaviour];
 #endif
   if (FRAME_EXTERNAL_TOOL_BAR (emacsframe))
@@ -6221,7 +6221,7 @@ if (cols > 0 && rows > 0)
 
   if (fs_is_native)
     {
-#ifdef NS_IMPL_COCOA
+#ifdef HAVE_NATIVE_FS
       [[self window] toggleFullScreen:sender];
 #endif
       return;