From: Kenichi Handa <handa@m17n.org>
Date: Thu, 1 May 2008 01:00:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f2c7c0fc823d0c28f1cdf2a3c51d7fa939a5a69;p=emacs.git

*** empty log message ***
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 0bc81fb1de2..b861e217fe6 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3758,7 +3758,7 @@ x_update_menu_appearance (f)
 	      || !UNSPECIFIEDP (LFACE_SLANT (lface))
 	      || !UNSPECIFIEDP (LFACE_HEIGHT (lface))))
 	{
-	  Lisp_Object xlfd = font_xlfd_name (LFACE_FONT (lface))
+	  Lisp_Object xlfd = Ffont_xlfd_name (LFACE_FONT (lface));
 #ifdef USE_MOTIF
 	  const char *suffix = "List";
 	  Bool motif = True;
@@ -3779,7 +3779,7 @@ x_update_menu_appearance (f)
 		P_ ((char *base_fontname, Bool motif));
 	      char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif);
 #else
-	      char *fontsetname = SDATA (xlfd);
+	      char *fontsetname = (char *) SDATA (xlfd);
 #endif
 	      sprintf (line, "%s.pane.menubar*font%s: %s",
 		       myname, suffix, fontsetname);
@@ -3788,7 +3788,7 @@ x_update_menu_appearance (f)
 		       myname, popup_path, suffix, fontsetname);
 	      XrmPutLineResource (&rdb, line);
 	      changed_p = 1;
-	      if (fontsetname != SDATA (xlfd))
+	      if (fontsetname != (char *) SDATA (xlfd))
 		xfree (fontsetname);
 	    }
 	}
diff --git a/src/xfns.c b/src/xfns.c
index ffdf6774a9e..1d8d004cd63 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3294,7 +3294,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
 #ifdef USE_LUCID
   /* Prevent lwlib/xlwmenu.c from crashing because of a bug
      whereby it fails to get any font.  */
-  xlwmenu_default_font = FRAME_FONT (f);
+  xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed");
 #endif
 
   /* Frame contents get displaced if an embedded X window has a border.  */