aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2013-10-08 08:12:40 +0200
committerJan Djärv2013-10-08 08:12:40 +0200
commitd180bde8e49f2475adbbd987d3f98dde20c9b18e (patch)
tree97be6e595211725a79592a19afa330781a218452
parent5ea75d23351858b406ebcbfadcdc3b58779aa792 (diff)
downloademacs-d180bde8e49f2475adbbd987d3f98dde20c9b18e.tar.gz
emacs-d180bde8e49f2475adbbd987d3f98dde20c9b18e.zip
* nsterm.m (windowDidExitFullScreen:):
(toggleFullScreen:): Change NS_IMPL_COCOA to HAVE_NATIVE_FS.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m4
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 @@
12013-10-08 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (windowDidExitFullScreen:):
4 (toggleFullScreen:): Change NS_IMPL_COCOA to HAVE_NATIVE_FS.
5
12013-10-08 Paul Eggert <eggert@cs.ucla.edu> 62013-10-08 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Fix race where emacs aborts when sent SIGTERM (Bug#15534). 8 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)
6160{ 6160{
6161 [self setFSValue: fs_before_fs]; 6161 [self setFSValue: fs_before_fs];
6162 fs_before_fs = -1; 6162 fs_before_fs = -1;
6163#ifdef NS_IMPL_COCOA 6163#ifdef HAVE_NATIVE_FS
6164 [self updateCollectionBehaviour]; 6164 [self updateCollectionBehaviour];
6165#endif 6165#endif
6166 if (FRAME_EXTERNAL_TOOL_BAR (emacsframe)) 6166 if (FRAME_EXTERNAL_TOOL_BAR (emacsframe))
@@ -6221,7 +6221,7 @@ if (cols > 0 && rows > 0)
6221 6221
6222 if (fs_is_native) 6222 if (fs_is_native)
6223 { 6223 {
6224#ifdef NS_IMPL_COCOA 6224#ifdef HAVE_NATIVE_FS
6225 [[self window] toggleFullScreen:sender]; 6225 [[self window] toggleFullScreen:sender];
6226#endif 6226#endif
6227 return; 6227 return;