terminal->terminal_coding =
(struct coding_system *) xmalloc (sizeof (struct coding_system));
- setup_coding_system (Qnil, terminal->keyboard_coding);
- setup_coding_system (Qnil, terminal->terminal_coding);
+ setup_coding_system (Qno_conversion, terminal->keyboard_coding);
+ setup_coding_system (Qundecided, terminal->terminal_coding);
terminal->param_alist = Qnil;
return terminal;
struct frame *f = XFRAME (frame);
if (FRAME_LIVE_P (f) && f->terminal == terminal)
{
+ /* Maybe this should pass Qnoelisp rather than Qt? */
Fdelete_frame (frame, Qt);
}
}
#endif
}
+Lisp_Object Qrun_hook_with_args;
+static Lisp_Object Qdelete_terminal_functions;
+static Lisp_Object Vdelete_terminal_functions;
+
DEFUN ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0,
doc: /* Delete TERMINAL by deleting all frames on it and closing the terminal.
TERMINAL may be a terminal id, a frame, or nil (meaning the selected
(terminal, force)
Lisp_Object terminal, force;
{
- struct terminal *t, *p;
-
- t = get_terminal (terminal, 0);
+ struct terminal *t = get_terminal (terminal, 0);
if (!t)
return Qnil;
- p = terminal_list;
- while (p && (p == t || !TERMINAL_ACTIVE_P (p)))
- p = p->next_terminal;
-
- if (NILP (force) && !p)
- error ("Attempt to delete the sole active display terminal");
+ if (NILP (force))
+ {
+ struct terminal *p = terminal_list;
+ while (p && (p == t || !TERMINAL_ACTIVE_P (p)))
+ p = p->next_terminal;
+
+ if (!p)
+ error ("Attempt to delete the sole active display terminal");
+ }
+
+ if (NILP (Vrun_hooks))
+ ;
+ else if (EQ (force, Qnoelisp))
+ pending_funcalls
+ = Fcons (list3 (Qrun_hook_with_args,
+ Qdelete_terminal_functions, terminal),
+ pending_funcalls);
+ else
+ safe_call2 (Qrun_hook_with_args, Qdelete_terminal_functions, terminal);
if (t->delete_terminal_hook)
(*t->delete_terminal_hook) (t);
The function should accept no arguments. */);
Vring_bell_function = Qnil;
+ DEFVAR_LISP ("delete-terminal-functions", &Vdelete_terminal_functions,
+ doc: /* Special hook run when a terminal is deleted.
+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;
+ Qdelete_terminal_functions = intern ("delete-terminal-functions");
+ staticpro (&Qdelete_terminal_functions);
+ Qrun_hook_with_args = intern ("run-hook-with-args");
+ staticpro (&Qrun_hook_with_args);
+
defsubr (&Sdelete_terminal);
defsubr (&Sframe_terminal);
defsubr (&Sterminal_live_p);