diff options
Diffstat (limited to 'src/terminal.c')
| -rw-r--r-- | src/terminal.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/terminal.c b/src/terminal.c index d94164a4e40..719c2a36111 100644 --- a/src/terminal.c +++ b/src/terminal.c | |||
| @@ -21,7 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | #define TERMHOOKS_INLINE EXTERN_INLINE | 21 | #define TERMHOOKS_INLINE EXTERN_INLINE |
| 22 | 22 | ||
| 23 | #include <stdio.h> | 23 | #include <stdio.h> |
| 24 | #include <setjmp.h> | ||
| 25 | 24 | ||
| 26 | #include "lisp.h" | 25 | #include "lisp.h" |
| 27 | #include "frame.h" | 26 | #include "frame.h" |
| @@ -294,7 +293,7 @@ delete_terminal (struct terminal *terminal) | |||
| 294 | 293 | ||
| 295 | for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal) | 294 | for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal) |
| 296 | if (! *tp) | 295 | if (! *tp) |
| 297 | abort (); | 296 | emacs_abort (); |
| 298 | *tp = terminal->next_terminal; | 297 | *tp = terminal->next_terminal; |
| 299 | 298 | ||
| 300 | xfree (terminal->keyboard_coding); | 299 | xfree (terminal->keyboard_coding); |
| @@ -411,7 +410,7 @@ possible return values. */) | |||
| 411 | case output_ns: | 410 | case output_ns: |
| 412 | return Qns; | 411 | return Qns; |
| 413 | default: | 412 | default: |
| 414 | abort (); | 413 | emacs_abort (); |
| 415 | } | 414 | } |
| 416 | } | 415 | } |
| 417 | 416 | ||
| @@ -519,7 +518,7 @@ struct terminal * | |||
| 519 | init_initial_terminal (void) | 518 | init_initial_terminal (void) |
| 520 | { | 519 | { |
| 521 | if (initialized || terminal_list || tty_list) | 520 | if (initialized || terminal_list || tty_list) |
| 522 | abort (); | 521 | emacs_abort (); |
| 523 | 522 | ||
| 524 | initial_terminal = create_terminal (); | 523 | initial_terminal = create_terminal (); |
| 525 | initial_terminal->type = output_initial; | 524 | initial_terminal->type = output_initial; |
| @@ -538,7 +537,7 @@ static void | |||
| 538 | delete_initial_terminal (struct terminal *terminal) | 537 | delete_initial_terminal (struct terminal *terminal) |
| 539 | { | 538 | { |
| 540 | if (terminal != initial_terminal) | 539 | if (terminal != initial_terminal) |
| 541 | abort (); | 540 | emacs_abort (); |
| 542 | 541 | ||
| 543 | delete_terminal (terminal); | 542 | delete_terminal (terminal); |
| 544 | initial_terminal = NULL; | 543 | initial_terminal = NULL; |