comparison src/console.c @ 5126:2a462149bd6a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 19:04:27 -0600
parents b5df3737028a 92dc90c0bb40
children a9c41067dd88
comparison
equal deleted inserted replaced
5125:b5df3737028a 5126:2a462149bd6a
1 /* The console object. 1 /* The console object.
2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1996, 2002 Ben Wing. 3 Copyright (C) 1996, 2002, 2010 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
39 #include "window.h" 39 #include "window.h"
40 40
41 #include "console-stream-impl.h" 41 #include "console-stream-impl.h"
42 #ifdef HAVE_TTY 42 #ifdef HAVE_TTY
43 #include "console-tty-impl.h" 43 #include "console-tty-impl.h"
44 #endif
45
46 #ifdef HAVE_TTY
47 #define USED_IF_TTY(decl) decl
48 #else
49 #define USED_IF_TTY(decl) UNUSED (decl)
50 #endif 44 #endif
51 45
52 Lisp_Object Vconsole_list, Vselected_console; 46 Lisp_Object Vconsole_list, Vselected_console;
53 47
54 Lisp_Object Vcreate_console_hook, Vdelete_console_hook; 48 Lisp_Object Vcreate_console_hook, Vdelete_console_hook;
1595 */ ); 1589 */ );
1596 1590
1597 /* Check for DEFVAR_CONSOLE_LOCAL without initializing the corresponding 1591 /* Check for DEFVAR_CONSOLE_LOCAL without initializing the corresponding
1598 slot of console_local_flags and vice-versa. Must be done after all 1592 slot of console_local_flags and vice-versa. Must be done after all
1599 DEFVAR_CONSOLE_LOCAL() calls. */ 1593 DEFVAR_CONSOLE_LOCAL() calls. */
1600 #define MARKED_SLOT(slot) \ 1594 #define MARKED_SLOT(slot) \
1601 if ((XINT (console_local_flags.slot) != -2 && \ 1595 assert ((XINT (console_local_flags.slot) != -2 && \
1602 XINT (console_local_flags.slot) != -3) \ 1596 XINT (console_local_flags.slot) != -3) \
1603 != !(NILP (XCONSOLE (Vconsole_local_symbols)->slot))) \ 1597 == !(NILP (XCONSOLE (Vconsole_local_symbols)->slot)));
1604 ABORT ();
1605 #include "conslots.h" 1598 #include "conslots.h"
1606 } 1599 }