diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-10-03 09:23:16 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-10-03 09:23:16 -0700 |
| commit | 48adb87bcb0f27e2d18fc6523c472af4916d5884 (patch) | |
| tree | 0299f7ce336e0d21fe902af6809798e3bb2045a7 /src/terminal.c | |
| parent | 51f0cccdde9bd1679e20f35d30e39e872ce6513a (diff) | |
| parent | 7296b6fbf27aeae76ea63ab2d9d9f2e46491b971 (diff) | |
| download | emacs-48adb87bcb0f27e2d18fc6523c472af4916d5884.tar.gz | |
Merge from origin/emacs-26
7296b6f Improve cl-do, cl-do* docstrings
d416109 Avoid returning early in 'while-no-input' due to subprocesses
e8a4d94 Cleanup when opening a new terminal fails. (Bug#32794)
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/terminal.c')
| -rw-r--r-- | src/terminal.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c index 18982fe7044..e4803592575 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 (); |