diff options
| author | Paul Eggert | 2011-10-25 16:01:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-25 16:01:16 -0700 |
| commit | f0ecbca80a004824d74ca9bc8b77cc94b2489b34 (patch) | |
| tree | 1bce01242894a7840910731adc5b76c99f8e6c89 /src/dispextern.h | |
| parent | a14e15687ce2e0a02e27bf85f70b3d9c7dfdf850 (diff) | |
| parent | 507ea2587e3b868468e83ff6bc8b3303c4097984 (diff) | |
| download | emacs-f0ecbca80a004824d74ca9bc8b77cc94b2489b34.tar.gz emacs-f0ecbca80a004824d74ca9bc8b77cc94b2489b34.zip | |
Merge from trunk.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 5f2c844b58d..b1c3d6237c9 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -3346,6 +3346,7 @@ extern int tty_capable_p (struct tty_display_info *, unsigned, unsigned long, un | |||
| 3346 | extern void set_tty_color_mode (struct tty_display_info *, struct frame *); | 3346 | extern void set_tty_color_mode (struct tty_display_info *, struct frame *); |
| 3347 | extern struct terminal *get_named_tty (const char *); | 3347 | extern struct terminal *get_named_tty (const char *); |
| 3348 | EXFUN (Ftty_type, 1); | 3348 | EXFUN (Ftty_type, 1); |
| 3349 | EXFUN (Fcontrolling_tty_p, 1); | ||
| 3349 | extern void create_tty_output (struct frame *); | 3350 | extern void create_tty_output (struct frame *); |
| 3350 | extern struct terminal *init_tty (const char *, const char *, int); | 3351 | extern struct terminal *init_tty (const char *, const char *, int); |
| 3351 | extern void tty_append_glyph (struct it *); | 3352 | extern void tty_append_glyph (struct it *); |