From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 29 May 2006 09:42:41 +0000 (+0000)
Subject: [USE_MAC_FONT_PANEL] (Fmac_set_font_panel_visibility):
X-Git-Tag: emacs-pretest-22.0.90~2204
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54b9479288eebf18fabc23ff17ba7231425a3f55;p=emacs.git

[USE_MAC_FONT_PANEL] (Fmac_set_font_panel_visibility):
Call mac_set_font_info_for_selection if font panel is made visible.
---

diff --git a/src/macfns.c b/src/macfns.c
index 43d994c1357..1f2c2d39f47 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)