Merge branch 'emacs-24'

[gnu-emacs] / src / termhooks.h

diff --git a/src/termhooks.h b/src/termhooks.h
index 8d85fba8af86cb2a3b8671aff57de129ca123b74..9cab853ed3d466c96f2ad231062423bb7c61140b 100644 (file)
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -681,7 +681,9 @@ extern struct terminal *terminal_list;
   (t->type == output_ns ? t->display_info.ns->name_list_element : Qnil)
 #endif
 
-extern struct terminal *get_terminal (Lisp_Object terminal, bool);
+extern struct terminal *decode_live_terminal (Lisp_Object);
+extern struct terminal *decode_tty_terminal (Lisp_Object);
+extern struct terminal *get_named_terminal (const char *);
 extern struct terminal *create_terminal (enum output_method,
                                         struct redisplay_interface *);
 extern void delete_terminal (struct terminal *);