summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-10-25 09:36:20 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-10-25 09:36:20 -0700
commitfe0055fa74c94ba1d3bbdf36cffd3d28ffe95158 (patch)
treea8d027a06bc46f07899ee2ca4527b397bc6fd36a
parente6346438e26069017f0eb5e1b15c53c30587462e (diff)
* dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2).
-rw-r--r--src/ChangeLog4
-rw-r--r--src/dispextern.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 52581be286..854c4987be 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-25 Paul Eggert <eggert@cs.ucla.edu>
+
+ * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2).
+
2011-10-25 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (test_undefined): New function (bug#9751).
diff --git a/src/dispextern.h b/src/dispextern.h
index dd5f67d2d1..5c60a5499d 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
extern void set_tty_color_mode (struct tty_display_info *, struct frame *);
extern struct terminal *get_named_tty (const char *);
EXFUN (Ftty_type, 1);
+EXFUN (Fcontrolling_tty_p, 1);
extern void create_tty_output (struct frame *);
extern struct terminal *init_tty (const char *, const char *, int);
extern void tty_append_glyph (struct it *);