aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorGlenn Morris2018-10-03 09:23:16 -0700
committerGlenn Morris2018-10-03 09:23:16 -0700
commit48adb87bcb0f27e2d18fc6523c472af4916d5884 (patch)
tree0299f7ce336e0d21fe902af6809798e3bb2045a7 /src/term.c
parent51f0cccdde9bd1679e20f35d30e39e872ce6513a (diff)
parent7296b6fbf27aeae76ea63ab2d9d9f2e46491b971 (diff)
downloademacs-48adb87bcb0f27e2d18fc6523c472af4916d5884.tar.gz
emacs-48adb87bcb0f27e2d18fc6523c472af4916d5884.zip
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/term.c')
-rw-r--r--src/term.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c
index ce24f6915fc..852dc23bd60 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4008,6 +4008,7 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed)
4008 char const *diagnostic 4008 char const *diagnostic
4009 = (fd < 0) ? "Could not open file: %s" : "Not a tty device: %s"; 4009 = (fd < 0) ? "Could not open file: %s" : "Not a tty device: %s";
4010 emacs_close (fd); 4010 emacs_close (fd);
4011 delete_terminal_internal (terminal);
4011 maybe_fatal (must_succeed, terminal, diagnostic, diagnostic, name); 4012 maybe_fatal (must_succeed, terminal, diagnostic, diagnostic, name);
4012 } 4013 }
4013 4014