X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/01d0930532c2fbcf249a4dfa36e8365090e109e7..54b9479288eebf18fabc23ff17ba7231425a3f55:/src/macfns.c

diff --git a/src/macfns.c b/src/macfns.c
index 43d994c135..1f2c2d39f4 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -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)