Mercurial > emacs
comparison src/xterm.h @ 83536:0014f454c421
Fix x_catch_errors-related abort after X disconnects. (Reported by Dan Nicolaescu).
* src/xterm.h: Remove declaration for x_fully_uncatch_errors.
* src/xterm.c (x_fully_uncatch_errors): Disable definition.
* src/eval.c (unwind_to_catch): Don't call x_fully_uncatch_errors.
(internal_condition_case, internal_condition_case_1)
(internal_condition_case_2): Don't abort when x_catching_errors.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-576
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 29 Jul 2006 18:41:57 +0000 |
| parents | a387c138b28e |
| children | 694bbb62a75d |
comparison
equal
deleted
inserted
replaced
| 83535:6c8cebe86511 | 83536:0014f454c421 |
|---|---|
| 973 extern void x_check_errors P_ ((Display *, char *)); | 973 extern void x_check_errors P_ ((Display *, char *)); |
| 974 extern int x_had_errors_p P_ ((Display *)); | 974 extern int x_had_errors_p P_ ((Display *)); |
| 975 extern int x_catching_errors P_ ((void)); | 975 extern int x_catching_errors P_ ((void)); |
| 976 extern void x_uncatch_errors P_ ((void)); | 976 extern void x_uncatch_errors P_ ((void)); |
| 977 extern void x_clear_errors P_ ((Display *)); | 977 extern void x_clear_errors P_ ((Display *)); |
| 978 extern void x_fully_uncatch_errors P_ ((void)); | |
| 979 extern void x_set_window_size P_ ((struct frame *, int, int, int)); | 978 extern void x_set_window_size P_ ((struct frame *, int, int, int)); |
| 980 extern void x_set_mouse_position P_ ((struct frame *, int, int)); | 979 extern void x_set_mouse_position P_ ((struct frame *, int, int)); |
| 981 extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); | 980 extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); |
| 982 extern void x_raise_frame P_ ((struct frame *)); | 981 extern void x_raise_frame P_ ((struct frame *)); |
| 983 extern void x_lower_frame P_ ((struct frame *)); | 982 extern void x_lower_frame P_ ((struct frame *)); |