Mercurial > emacs
diff src/xterm.h @ 90341:5754737d1e04
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-34
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 123-134)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 40-48)
- Merge from emacs--devo--0
- Update from CVS
- Munge arch explicit ids in etc/images to match Emacs
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 03 Mar 2006 07:48:46 +0000 |
parents | 8a1ee48a8386 fdee8318ddc9 |
children | e3bacb89536a |
line wrap: on
line diff
--- a/src/xterm.h Fri Mar 03 05:16:17 2006 +0000 +++ b/src/xterm.h Fri Mar 03 07:48:46 2006 +0000 @@ -963,7 +963,7 @@ void x_wm_set_size_hint P_ ((struct frame *, long, int)); void x_catch_errors P_ ((Display *)); int x_had_errors_p P_ ((Display *)); -void x_uncatch_errors P_ ((Display *)); +void x_uncatch_errors P_ ((void)); void x_check_errors P_ ((Display *, char *)); int x_text_icon P_ ((struct frame *, char *)); int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); @@ -980,7 +980,7 @@ extern void x_catch_errors P_ ((Display *)); extern void x_check_errors P_ ((Display *, char *)); extern int x_had_errors_p P_ ((Display *)); -extern void x_uncatch_errors P_ ((Display *)); +extern void x_uncatch_errors P_ ((void)); extern void x_set_window_size P_ ((struct frame *, int, int, int)); extern void x_set_mouse_position P_ ((struct frame *, int, int)); extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int));