Mercurial > emacs

comparison src/macfns.c @ 90075:c43084d0b52b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 cb67264d6096
children b1b6eac1aaa3
comparison
equal deleted inserted replaced
90074:98b0ed9e564d 90075:c43084d0b52b
1 /* Graphical user interface functions for Mac OS. 1 s/* Graphical user interface functions for Mac OS.
2 Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. 2 Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
3 3
4 This file is part of GNU Emacs. 4 This file is part of GNU Emacs.
5 5
6 GNU Emacs is free software; you can redistribute it and/or modify 6 GNU Emacs is free software; you can redistribute it and/or modify
2685 2685
2686 font = mac_get_arg (parms, Qfont, "font", "Font", RES_TYPE_STRING); 2686 font = mac_get_arg (parms, Qfont, "font", "Font", RES_TYPE_STRING);
2687 2687
2688 BLOCK_INPUT; 2688 BLOCK_INPUT;
2689 /* First, try whatever font the caller has specified. */ 2689 /* First, try whatever font the caller has specified. */
2690 #if 0 /* MAC_TODO: This crashed */
2690 if (STRINGP (font)) 2691 if (STRINGP (font))
2691 { 2692 {
2692 tem = Fquery_fontset (font, Qnil); 2693 tem = Fquery_fontset (font, Qnil);
2693 if (STRINGP (tem)) 2694 if (STRINGP (tem))
2694 font = x_new_fontset (f, SDATA (tem)); 2695 font = x_new_fontset (f, SDATA (tem));
2695 else 2696 else
2696 font = x_new_font (f, SDATA (font)); 2697 font = x_new_font (f, SDATA (font));
2697 } 2698 }
2699 #endif
2698 2700
2699 /* Try out a font which we hope has bold and italic variations. */ 2701 /* Try out a font which we hope has bold and italic variations. */
2700 if (! STRINGP (font)) 2702 if (! STRINGP (font))
2701 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); 2703 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
2702 /* If those didn't work, look for something which will at least work. */ 2704 /* If those didn't work, look for something which will at least work. */
3801 3803
3802 font = mac_get_arg (parms, Qfont, "font", "Font", RES_TYPE_STRING); 3804 font = mac_get_arg (parms, Qfont, "font", "Font", RES_TYPE_STRING);
3803 3805
3804 BLOCK_INPUT; 3806 BLOCK_INPUT;
3805 /* First, try whatever font the caller has specified. */ 3807 /* First, try whatever font the caller has specified. */
3808 #if 0 /* MAC_TODO: This crashed */
3806 if (STRINGP (font)) 3809 if (STRINGP (font))
3807 { 3810 {
3808 tem = Fquery_fontset (font, Qnil); 3811 tem = Fquery_fontset (font, Qnil);
3809 if (STRINGP (tem)) 3812 if (STRINGP (tem))
3810 font = x_new_fontset (f, SDATA (tem)); 3813 font = x_new_fontset (f, SDATA (tem));
3811 else 3814 else
3812 font = x_new_font (f, SDATA (font)); 3815 font = x_new_font (f, SDATA (font));
3813 } 3816 }
3817 #endif
3814 3818
3815 /* Try out a font which we hope has bold and italic variations. */ 3819 /* Try out a font which we hope has bold and italic variations. */
3816 if (! STRINGP (font)) 3820 if (! STRINGP (font))
3817 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); 3821 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
3818 /* If those didn't work, look for something which will at least work. */ 3822 /* If those didn't work, look for something which will at least work. */