Re: Emacs Mac port

[YAMAMOTO Mitsuharu]

>>>>> On Fri, 30 Oct 2015 11:52:28 +0900, YAMAMOTO Mitsuharu <address@hidden> 
>>>>> said:

> The fifth update of the Mac port based on Emacs 24.5 is available from
>   ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-24.5-mac-5.12.tar.gz

> and Git repository is also available at

>   http://www.math.s.chiba-u.ac.jp/~mituharu/emacs-mac.git

I've just made another release to fix a crash bug.

  ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-24.5-mac-5.13.tar.gz

If you already have emacs-24.5-mac-5.12.tar.gz, then you only need to
apply the patch below.  Sorry for the inconvenience.

                                     YAMAMOTO Mitsuharu
                                address@hidden

** Fixed bugs

*** Closing a fullscreen frame may cause crash or Lisp error in
frame-live-p.

** Improvements

*** Fullboth frames are no longer eligible to become fullscreen via
Mission Control on OS X 10.11 (this change is actually made in 5.12).


diff --git a/src/macappkit.m b/src/macappkit.m
index 574bfb3..2a91aa0 100644
--- a/src/macappkit.m
+++ b/src/macappkit.m
@@ -4078,6 +4078,10 @@ static CGRect unset_global_focus_view_frame (void);
   EmacsFrameController * __unsafe_unretained weakSelf = self;
   BOOL savedToolbarVisibility;
 
+  /* Called also when a full screen window is being closed.  */
+  if (overlayWindow == nil)
+    return;
+
   if (fullScreenTargetState & WM_STATE_DEDICATED_DESKTOP)
     {
       /* Exiting full screen is triggered by external events rather
@@ -4093,15 +4097,11 @@ static CGRect unset_global_focus_view_frame (void);
   if (!(floor (NSAppKitVersionNumber) <= NSAppKitVersionNumber10_10_Max))
     [self preprocessWindowManagerStateChange:fullScreenTargetState];
 
-  /* Called also when a full screen window is being closed.  */
-  if (overlayWindow)
-    {
-      [self detachOverlayWindow];
-      [self addFullScreenTransitionCompletionHandler:^(EmacsWindow *window,
-                                                      BOOL success) {
-         [weakSelf attachOverlayWindow];
-       }];
-    }
+  [self detachOverlayWindow];
+  [self addFullScreenTransitionCompletionHandler:^(EmacsWindow *window,
+                                                  BOOL success) {
+      [weakSelf attachOverlayWindow];
+    }];
 
   /* This is a workaround for the problem of not preserving toolbar
      visibility value.  */