diff options
| author | Po Lu | 2022-05-27 08:12:52 +0800 |
|---|---|---|
| committer | Po Lu | 2022-05-27 08:13:09 +0800 |
| commit | 061c2d683fae03b63872c08f6c4db37f930bb3b7 (patch) | |
| tree | c87161c71a3d43978b5c40ca158d3051feb9eef7 /src | |
| parent | 2c76cee37cd9e3e275ff1543018e7535038f5cb6 (diff) | |
| download | emacs-061c2d683fae03b63872c08f6c4db37f930bb3b7.tar.gz emacs-061c2d683fae03b63872c08f6c4db37f930bb3b7.zip | |
Fix longjmp/siglongjmp mixup
* src/xterm.c (xm_drag_window_io_error_handler)
(x_dnd_io_error_handler): Use `siglongjmp'. Reported by Ken
Brown <kbrown@cornell.edu>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index d949439d188..2c50b508151 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -1157,7 +1157,7 @@ static unsigned int x_dnd_keyboard_state; | |||
| 1157 | 1157 | ||
| 1158 | /* jmp_buf that gets us out of the IO error handler if an error occurs | 1158 | /* jmp_buf that gets us out of the IO error handler if an error occurs |
| 1159 | terminating DND as part of the display disconnect handler. */ | 1159 | terminating DND as part of the display disconnect handler. */ |
| 1160 | static jmp_buf x_dnd_disconnect_handler; | 1160 | static sigjmp_buf x_dnd_disconnect_handler; |
| 1161 | 1161 | ||
| 1162 | /* Structure describing a single window that can be the target of | 1162 | /* Structure describing a single window that can be the target of |
| 1163 | drag-and-drop operations. */ | 1163 | drag-and-drop operations. */ |
| @@ -1612,7 +1612,7 @@ xm_drag_window_io_error_handler (Display *dpy) | |||
| 1612 | { | 1612 | { |
| 1613 | /* DPY isn't created through GDK, so it doesn't matter if we don't | 1613 | /* DPY isn't created through GDK, so it doesn't matter if we don't |
| 1614 | crash here. */ | 1614 | crash here. */ |
| 1615 | longjmp (x_dnd_disconnect_handler, 1); | 1615 | siglongjmp (x_dnd_disconnect_handler, 1); |
| 1616 | } | 1616 | } |
| 1617 | 1617 | ||
| 1618 | static Window | 1618 | static Window |
| @@ -2830,7 +2830,7 @@ x_dnd_io_error_handler (Display *display) | |||
| 2830 | #ifdef USE_GTK | 2830 | #ifdef USE_GTK |
| 2831 | emacs_abort (); | 2831 | emacs_abort (); |
| 2832 | #else | 2832 | #else |
| 2833 | longjmp (x_dnd_disconnect_handler, 1); | 2833 | siglongjmp (x_dnd_disconnect_handler, 1); |
| 2834 | #endif | 2834 | #endif |
| 2835 | } | 2835 | } |
| 2836 | 2836 | ||