aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2010-07-15 23:54:10 +0200
committerAndreas Schwab2010-07-15 23:54:10 +0200
commit01b564ff5e1e71e4e860e579f0f056b35d1191d0 (patch)
tree7378d402644147e672a917b8ef059046e59cf484 /src
parent2b23d2a6b11385b571eeac64f3c1b0e8d194823c (diff)
downloademacs-01b564ff5e1e71e4e860e579f0f056b35d1191d0.tar.gz
emacs-01b564ff5e1e71e4e860e579f0f056b35d1191d0.zip
* xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font): Convert old-style definition.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xterm.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c2f8c596ed9..35c4294a9f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12010-07-15 Andreas Schwab <schwab@linux-m68k.org> 12010-07-15 Andreas Schwab <schwab@linux-m68k.org>
2 2
3 * xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font):
4 Convert old-style definition.
5
3 * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of 6 * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of
4 timestamp argument. 7 timestamp argument.
5 8
diff --git a/src/xterm.c b/src/xterm.c
index 1427797f8d5..0f6d432f979 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7503,7 +7503,7 @@ x_clear_errors (Display *dpy)
7503/* Close off all unclosed x_catch_errors calls. */ 7503/* Close off all unclosed x_catch_errors calls. */
7504 7504
7505void 7505void
7506x_fully_uncatch_errors () 7506x_fully_uncatch_errors (void)
7507{ 7507{
7508 while (x_error_message) 7508 while (x_error_message)
7509 x_uncatch_errors (); 7509 x_uncatch_errors ();
@@ -7520,7 +7520,7 @@ x_catching_errors (void)
7520 7520
7521#if 0 7521#if 0
7522static unsigned int x_wire_count; 7522static unsigned int x_wire_count;
7523x_trace_wire () 7523x_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}
@@ -9560,9 +9560,7 @@ x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y)
9560 font table. */ 9560 font table. */
9561 9561
9562static void 9562static void
9563x_check_font (f, font) 9563x_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