X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/727f97393714c5c92aef793f0749ebfde1d14f3c..11dde529083c0b3df2e8e91913426ed4975b77c3:/src/terminal.c
diff --git a/src/terminal.c b/src/terminal.c
index 854ca61f19..61c5d05094 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1,5 +1,5 @@
/* Functions related to terminal devices.
- Copyright (C) 2005-2012 Free Software Foundation, Inc.
+ Copyright (C) 2005-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -18,8 +18,6 @@ along with GNU Emacs. If not, see . */
#include
-#define TERMHOOKS_INLINE EXTERN_INLINE
-
#include
#include "lisp.h"
@@ -39,6 +37,8 @@ static int next_terminal_id;
/* The initial terminal device, created by initial_term_init. */
struct terminal *initial_terminal;
+static Lisp_Object Qterminal_live_p;
+
static void delete_initial_terminal (struct terminal *);
/* This setter is used only in this file, so it can be private. */
@@ -199,11 +199,11 @@ ins_del_lines (struct frame *f, int vpos, int n)
/* Return the terminal object specified by TERMINAL. TERMINAL may be
a terminal object, a frame, or nil for the terminal device of the
- current frame. If THROW is zero, return NULL for failure,
+ current frame. If THROW is false, return NULL for failure,
otherwise throw an error. */
struct terminal *
-get_terminal (Lisp_Object terminal, int throw)
+get_terminal (Lisp_Object terminal, bool throw)
{
struct terminal *result = NULL;
@@ -280,7 +280,7 @@ delete_terminal (struct terminal *terminal)
xfree (terminal->name);
terminal->name = NULL;
- /* Check for live frames that are still on this terminal. */
+ /* Check for live frames that are still on this terminal. */
FOR_EACH_FRAME (tail, frame)
{
struct frame *f = XFRAME (frame);
@@ -398,8 +398,6 @@ possible return values. */)
return Qw32;
case output_msdos_raw:
return Qpc;
- case output_mac:
- return Qmac;
case output_ns:
return Qns;
default:
@@ -551,6 +549,8 @@ Each function is called with argument, the terminal.
This may be called just before actually deleting the terminal,
or some time later. */);
Vdelete_terminal_functions = Qnil;
+
+ DEFSYM (Qterminal_live_p, "terminal-live-p");
DEFSYM (Qdelete_terminal_functions, "delete-terminal-functions");
DEFSYM (Qrun_hook_with_args, "run-hook-with-args");