diff options
| author | John Shahid <jvshahid@gmail.com> | 2018-09-21 11:15:10 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-09-29 09:30:01 +0300 |
| commit | e8a4d942dd7305b85850603c97d987e52510a726 (patch) | |
| tree | 0dd2b34be970a561941680a370d98b546b63df51 /src | |
| parent | 9ad0f1d15c06eb07dfbd9bd3e3b8a0d747942152 (diff) | |
| download | emacs-e8a4d942dd7305b85850603c97d987e52510a726.tar.gz emacs-e8a4d942dd7305b85850603c97d987e52510a726.tar.bz2 emacs-e8a4d942dd7305b85850603c97d987e52510a726.zip | |
Cleanup when opening a new terminal fails. (Bug#32794)
* src/term.c (init_tty): Call delete_terminal_internal if emacs_open
fail.
* src/terminal.c (delete_terminal): Move some code into
delete_terminal_internal and call it.
(delete_terminal_internal): New function.
* src/termhooks.h: Prototype for delete_terminal_internal.
Diffstat (limited to 'src')
| -rw-r--r-- | src/term.c | 1 | ||||
| -rw-r--r-- | src/termhooks.h | 1 | ||||
| -rw-r--r-- | src/terminal.c | 9 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index f542fc527c4..8493cc02c4d 100644 --- a/src/term.c +++ b/src/term.c @@ -4004,6 +4004,7 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed) char const *diagnostic = (fd < 0) ? "Could not open file: %s" : "Not a tty device: %s"; emacs_close (fd); + delete_terminal_internal (terminal); maybe_fatal (must_succeed, terminal, diagnostic, diagnostic, name); } diff --git a/src/termhooks.h b/src/termhooks.h index 1b2c95e8248..543809b9e40 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -729,6 +729,7 @@ extern struct terminal *get_named_terminal (const char *); extern struct terminal *create_terminal (enum output_method, struct redisplay_interface *); extern void delete_terminal (struct terminal *); +extern void delete_terminal_internal (struct terminal *); extern Lisp_Object terminal_glyph_code (struct terminal *, int); /* The initial terminal device, created by initial_term_init. */ diff --git a/src/terminal.c b/src/terminal.c index 070b8aac1fe..043ee67e0c1 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -314,7 +314,6 @@ create_terminal (enum output_method type, struct redisplay_interface *rif) void delete_terminal (struct terminal *terminal) { - struct terminal **tp; Lisp_Object tail, frame; /* Protect against recursive calls. delete_frame calls the @@ -335,6 +334,14 @@ delete_terminal (struct terminal *terminal) } } + delete_terminal_internal (terminal); +} + +void +delete_terminal_internal (struct terminal *terminal) +{ + struct terminal **tp; + for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal) if (! *tp) emacs_abort (); |