diff options
| author | Paul Eggert | 2011-10-25 09:36:20 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-25 09:36:20 -0700 |
| commit | fe0055fa74c94ba1d3bbdf36cffd3d28ffe95158 (patch) | |
| tree | a8d027a06bc46f07899ee2ca4527b397bc6fd36a /src | |
| parent | e6346438e26069017f0eb5e1b15c53c30587462e (diff) | |
| download | emacs-fe0055fa74c94ba1d3bbdf36cffd3d28ffe95158.tar.gz emacs-fe0055fa74c94ba1d3bbdf36cffd3d28ffe95158.zip | |
* dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dispextern.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 52581be2863..854c4987be5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-10-25 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2). | ||
| 4 | |||
| 1 | 2011-10-25 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2011-10-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * keyboard.c (test_undefined): New function (bug#9751). | 7 | * keyboard.c (test_undefined): New function (bug#9751). |
diff --git a/src/dispextern.h b/src/dispextern.h index dd5f67d2d10..5c60a5499da 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 *); |