* nsterm.m (windowDidExitFullScreen:):

(toggleFullScreen:): Change NS_IMPL_COCOA to HAVE_NATIVE_FS.

* nsterm.m (windowDidExitFullScreen:):
(toggleFullScreen:): Change NS_IMPL_COCOA to HAVE_NATIVE_FS.
d180bde8 · Jan Djärv · 5ea75d23 · d180bde8 · d180bde8
Commit d180bde8 authored Oct 08, 2013 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/nsterm.m src/nsterm.m +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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).

--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6160,7 +6160,7 @@ - (void)windowDidExitFullScreen:(NSNotification *)notification
 {
  [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 @@ - (void)toggleFullScreen: (id)sender

  if (fs_is_native)
    {
-#ifdef NS_IMPL_COCOA
+#ifdef HAVE_NATIVE_FS
      [[self window] toggleFullScreen:sender];
 #endif
      return;