Mercurial > emacs
comparison src/xterm.c @ 109441:0ed7d8444705
* xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font): Convert old-style definition.
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 15 Jul 2010 23:54:10 +0200 |
parents | 2e27c5066b94 |
children | 051595eb9b58 |
comparison
equal
deleted
inserted
replaced
109440:f8f118e78387 | 109441:0ed7d8444705 |
---|---|
7501 #if 0 /* See comment in unwind_to_catch why calling this is a bad | 7501 #if 0 /* See comment in unwind_to_catch why calling this is a bad |
7502 * idea. --lorentey */ | 7502 * idea. --lorentey */ |
7503 /* Close off all unclosed x_catch_errors calls. */ | 7503 /* Close off all unclosed x_catch_errors calls. */ |
7504 | 7504 |
7505 void | 7505 void |
7506 x_fully_uncatch_errors () | 7506 x_fully_uncatch_errors (void) |
7507 { | 7507 { |
7508 while (x_error_message) | 7508 while (x_error_message) |
7509 x_uncatch_errors (); | 7509 x_uncatch_errors (); |
7510 } | 7510 } |
7511 #endif | 7511 #endif |
7518 return x_error_message != 0; | 7518 return x_error_message != 0; |
7519 } | 7519 } |
7520 | 7520 |
7521 #if 0 | 7521 #if 0 |
7522 static unsigned int x_wire_count; | 7522 static unsigned int x_wire_count; |
7523 x_trace_wire () | 7523 x_trace_wire (void) |
7524 { | 7524 { |
7525 fprintf (stderr, "Lib call: %d\n", ++x_wire_count); | 7525 fprintf (stderr, "Lib call: %d\n", ++x_wire_count); |
7526 } | 7526 } |
7527 #endif /* ! 0 */ | 7527 #endif /* ! 0 */ |
7528 | 7528 |
9558 | 9558 |
9559 /* Check that FONT is valid on frame F. It is if it can be found in F's | 9559 /* Check that FONT is valid on frame F. It is if it can be found in F's |
9560 font table. */ | 9560 font table. */ |
9561 | 9561 |
9562 static void | 9562 static void |
9563 x_check_font (f, font) | 9563 x_check_font (struct frame *f, struct font *font) |
9564 struct frame *f; | |
9565 struct font *font; | |
9566 { | 9564 { |
9567 Lisp_Object frame; | 9565 Lisp_Object frame; |
9568 | 9566 |
9569 xassert (font != NULL && ! NILP (font->props[FONT_TYPE_INDEX])); | 9567 xassert (font != NULL && ! NILP (font->props[FONT_TYPE_INDEX])); |
9570 if (font->driver->check) | 9568 if (font->driver->check) |