mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-27 10:21:14 -08:00
Code Issues Projects Releases Wiki Activity

* macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.

Browse source 
Not sure if it's unnecessary.
This commit is contained in:
Steven Tamm 2005-01-18 04:50:08 +00:00
parent 9117fa34cb
commit cfa4901a57
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

10
src/macfns.c
View file

@ -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))