1 files changed, 16 insertions, 6 deletions

diff --git a/src/macfns.c b/src/macfns.c
index 577167e6fe3..4345cef2611 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1592,7 +1592,7 @@ x_set_icon_name (f, arg, oldval)
       if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
         return;
     }
-  else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
+  else if (!NILP (arg) || NILP (oldval))
     return;
 
   f->icon_name = arg;
@@ -3024,11 +3024,11 @@ If omitted or nil, that stands for the selected frame's display.  */)
     {
       if (response >= 0x00001040)
         {
-          err = Gestalt ('sys1', &major); /* gestaltSystemVersionMajor */
+          err = Gestalt (gestaltSystemVersionMajor, &major);
           if (err == noErr)
-            err = Gestalt ('sys2', &minor); /* gestaltSystemVersionMinor */
+            err = Gestalt (gestaltSystemVersionMinor, &minor);
           if (err == noErr)
-            err = Gestalt ('sys3', &bugfix); /* gestaltSystemVersionBugFix */
+            err = Gestalt (gestaltSystemVersionBugFix, &bugfix);
         }
       else
         {
@@ -4514,8 +4514,18 @@ This is for internal use only.  Use `mac-font-panel-mode' instead.  */)
   check_mac ();
 
   BLOCK_INPUT;
-  if (NILP (visible) == (FPIsFontPanelVisible () == true))
-    err = FPShowHideFontPanel ();
+  if (NILP (visible) != !mac_font_panel_visible_p ())
+    {
+      err = mac_show_hide_font_panel ();
+      if (err == noErr && !NILP (visible))
+        {
+          Lisp_Object focus_frame = x_get_focus_frame (SELECTED_FRAME ());
+          struct frame *f = (NILP (focus_frame) ? SELECTED_FRAME ()
+                             : XFRAME (focus_frame));
+
+          mac_set_font_info_for_selection (f, DEFAULT_FACE_ID, 0);
+        }
+    }
   UNBLOCK_INPUT;
 
   if (err != noErr)