diff options
| author | Jan Djärv | 2006-05-23 07:12:49 +0000 |
|---|---|---|
| committer | Jan Djärv | 2006-05-23 07:12:49 +0000 |
| commit | bdf1cc738261fdd81a0d7f3e08503d4db554cf2e (patch) | |
| tree | 8eb76a5168c35969cada9d51db873590f9e44e96 /src | |
| parent | b82234410a17f02794caa54e73cb7555d0aa389a (diff) | |
| download | emacs-bdf1cc738261fdd81a0d7f3e08503d4db554cf2e.tar.gz emacs-bdf1cc738261fdd81a0d7f3e08503d4db554cf2e.zip | |
* xterm.h: Add extern declarations for x_clear_errors,
x_fully_uncatch_errors, x_catching_errors and
x_alloc_lighter_color_for_widget. Remove duplicated declarations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/xterm.h b/src/xterm.h index 00b6e224078..797c8b30e0f 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -959,10 +959,6 @@ void x_delete_display P_ ((struct x_display_info *)); | |||
| 959 | void x_make_frame_visible P_ ((struct frame *)); | 959 | void x_make_frame_visible P_ ((struct frame *)); |
| 960 | void x_iconify_frame P_ ((struct frame *)); | 960 | void x_iconify_frame P_ ((struct frame *)); |
| 961 | void x_wm_set_size_hint P_ ((struct frame *, long, int)); | 961 | void x_wm_set_size_hint P_ ((struct frame *, long, int)); |
| 962 | void x_catch_errors P_ ((Display *)); | ||
| 963 | int x_had_errors_p P_ ((Display *)); | ||
| 964 | void x_uncatch_errors P_ ((void)); | ||
| 965 | void x_check_errors P_ ((Display *, char *)); | ||
| 966 | int x_text_icon P_ ((struct frame *, char *)); | 962 | int x_text_icon P_ ((struct frame *, char *)); |
| 967 | int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); | 963 | int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); |
| 968 | void x_set_window_size P_ ((struct frame *, int, int, int)); | 964 | void x_set_window_size P_ ((struct frame *, int, int, int)); |
| @@ -978,7 +974,10 @@ extern int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); | |||
| 978 | extern void x_catch_errors P_ ((Display *)); | 974 | extern void x_catch_errors P_ ((Display *)); |
| 979 | extern void x_check_errors P_ ((Display *, char *)); | 975 | extern void x_check_errors P_ ((Display *, char *)); |
| 980 | extern int x_had_errors_p P_ ((Display *)); | 976 | extern int x_had_errors_p P_ ((Display *)); |
| 977 | extern int x_catching_errors P_ ((void)); | ||
| 981 | extern void x_uncatch_errors P_ ((void)); | 978 | extern void x_uncatch_errors P_ ((void)); |
| 979 | extern void x_clear_errors P_ ((Display *)); | ||
| 980 | extern void x_fully_uncatch_errors P_ ((void)); | ||
| 982 | extern void x_set_window_size P_ ((struct frame *, int, int, int)); | 981 | extern void x_set_window_size P_ ((struct frame *, int, int, int)); |
| 983 | extern void x_set_mouse_position P_ ((struct frame *, int, int)); | 982 | extern void x_set_mouse_position P_ ((struct frame *, int, int)); |
| 984 | extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); | 983 | extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); |
| @@ -997,6 +996,9 @@ extern void x_initialize P_ ((void)); | |||
| 997 | extern unsigned long x_copy_color P_ ((struct frame *, unsigned long)); | 996 | extern unsigned long x_copy_color P_ ((struct frame *, unsigned long)); |
| 998 | #ifdef USE_X_TOOLKIT | 997 | #ifdef USE_X_TOOLKIT |
| 999 | extern XtAppContext Xt_app_con; | 998 | extern XtAppContext Xt_app_con; |
| 999 | extern int x_alloc_lighter_color_for_widget __P ((Widget, Display*, Colormap, | ||
| 1000 | unsigned long *, | ||
| 1001 | double, int)); | ||
| 1000 | #endif | 1002 | #endif |
| 1001 | extern void x_query_colors P_ ((struct frame *f, XColor *, int)); | 1003 | extern void x_query_colors P_ ((struct frame *f, XColor *, int)); |
| 1002 | extern void x_query_color P_ ((struct frame *f, XColor *)); | 1004 | extern void x_query_color P_ ((struct frame *f, XColor *)); |