Mercurial > emacs
changeset 90075:c43084d0b52b
* macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out
some possibly unnecessary fontset checking code that crashed
when creating a new frame
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Mon, 17 Jan 2005 07:35:44 +0000 |
| parents | 98b0ed9e564d |
| children | 7feda13f67b6 |
| files | src/ChangeLog src/macfns.c |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jan 17 02:36:57 2005 +0000 +++ b/src/ChangeLog Mon Jan 17 07:35:44 2005 +0000 @@ -1,3 +1,9 @@ +2005-01-16 Steven Tamm <steventamm@mac.com> + + * macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out + some possibly unnecessary fontset checking code that crashed + when creating a new frame + 2005-01-15 Steven Tamm <steventamm@mac.com> * macterm.c (Vmac_use_core_graphics): defined for
--- a/src/macfns.c Mon Jan 17 02:36:57 2005 +0000 +++ b/src/macfns.c Mon Jan 17 07:35:44 2005 +0000 @@ -1,4 +1,4 @@ -/* Graphical user interface functions for Mac OS. +s/* Graphical user interface functions for Mac OS. Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -2687,6 +2687,7 @@ BLOCK_INPUT; /* First, try whatever font the caller has specified. */ +#if 0 /* MAC_TODO: This crashed */ if (STRINGP (font)) { tem = Fquery_fontset (font, Qnil); @@ -2695,6 +2696,7 @@ else font = x_new_font (f, SDATA (font)); } +#endif /* Try out a font which we hope has bold and italic variations. */ if (! STRINGP (font)) @@ -3803,6 +3805,7 @@ BLOCK_INPUT; /* First, try whatever font the caller has specified. */ +#if 0 /* MAC_TODO: This crashed */ if (STRINGP (font)) { tem = Fquery_fontset (font, Qnil); @@ -3811,6 +3814,7 @@ else font = x_new_font (f, SDATA (font)); } +#endif /* Try out a font which we hope has bold and italic variations. */ if (! STRINGP (font))