diff options
| author | Glenn Morris | 2018-10-03 09:23:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-10-03 09:23:16 -0700 |
| commit | 48adb87bcb0f27e2d18fc6523c472af4916d5884 (patch) | |
| tree | 0299f7ce336e0d21fe902af6809798e3bb2045a7 /src/termhooks.h | |
| parent | 51f0cccdde9bd1679e20f35d30e39e872ce6513a (diff) | |
| parent | 7296b6fbf27aeae76ea63ab2d9d9f2e46491b971 (diff) | |
| download | emacs-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/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 211429169ba..4e341055100 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -733,6 +733,7 @@ extern struct terminal *get_named_terminal (const char *); | |||
| 733 | extern struct terminal *create_terminal (enum output_method, | 733 | extern struct terminal *create_terminal (enum output_method, |
| 734 | struct redisplay_interface *); | 734 | struct redisplay_interface *); |
| 735 | extern void delete_terminal (struct terminal *); | 735 | extern void delete_terminal (struct terminal *); |
| 736 | extern void delete_terminal_internal (struct terminal *); | ||
| 736 | extern Lisp_Object terminal_glyph_code (struct terminal *, int); | 737 | extern Lisp_Object terminal_glyph_code (struct terminal *, int); |
| 737 | 738 | ||
| 738 | /* The initial terminal device, created by initial_term_init. */ | 739 | /* The initial terminal device, created by initial_term_init. */ |