diff --git a/src/ChangeLog b/src/ChangeLog
index f1d6ee0c54d..1debb8b5ef6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-17  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.
+	Not sure if it's unnecessary.
+
 2005-01-16  Steven Tamm  <steventamm@mac.com>
 
 	* macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out
diff --git a/src/macfns.c b/src/macfns.c
index 11fb088e30d..7254ac41752 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1,4 +1,4 @@
-s/* Graphical user interface functions for Mac OS.
+/* Graphical user interface functions for Mac OS.
    Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2687,16 +2687,14 @@ This function is an internal primitive--use `make-frame' instead.  */)
 
     BLOCK_INPUT;
     /* First, try whatever font the caller has specified.  */
-#if 0 /* MAC_TODO: This crashed */
     if (STRINGP (font))
       {
 	tem = Fquery_fontset (font, Qnil);
 	if (STRINGP (tem))
-	  font = x_new_fontset (f, SDATA (tem));
+	  font = x_new_fontset (f, tem);
 	else
 	  font = x_new_font (f, SDATA (font));
       }
-#endif
 
     /* Try out a font which we hope has bold and italic variations.  */
     if (! STRINGP (font))
@@ -3805,16 +3803,14 @@ x_create_tip_frame (dpyinfo, parms, text)
 
     BLOCK_INPUT;
     /* First, try whatever font the caller has specified.  */
-#if 0  /* MAC_TODO: This crashed */
     if (STRINGP (font))
       {
 	tem = Fquery_fontset (font, Qnil);
 	if (STRINGP (tem))
-	  font = x_new_fontset (f, SDATA (tem));
+	  font = x_new_fontset (f, tem);
 	else
 	  font = x_new_font (f, SDATA (font));
       }
-#endif
 
     /* Try out a font which we hope has bold and italic variations.  */
     if (! STRINGP (font))