Mercurial > emacs
changeset 90081:b1b6eac1aaa3
* macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.
Not sure if it's unnecessary.
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Tue, 18 Jan 2005 04:50:08 +0000 |
| parents | d25630d179cc |
| children | 6d92d69fae33 |
| files | src/ChangeLog src/macfns.c |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jan 17 12:10:35 2005 +0000 +++ b/src/ChangeLog Tue Jan 18 04:50:08 2005 +0000 @@ -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
--- a/src/macfns.c Mon Jan 17 12:10:35 2005 +0000 +++ b/src/macfns.c Tue Jan 18 04:50:08 2005 +0000 @@ -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 @@ 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 @@ 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))