comparison src/console.c @ 5143:186aebf7f6c6

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 11:38:54 -0600
parents f965e31a35f0
children 88bd4f3ef8e4
comparison
equal deleted inserted replaced
5140:e5380fdaf8f1 5143:186aebf7f6c6
161 int UNUSED (escapeflag)) 161 int UNUSED (escapeflag))
162 { 162 {
163 struct console *con = XCONSOLE (obj); 163 struct console *con = XCONSOLE (obj);
164 164
165 if (print_readably) 165 if (print_readably)
166 printing_unreadable_lcrecord (obj, XSTRING_DATA (con->name)); 166 printing_unreadable_lisp_object (obj, XSTRING_DATA (con->name));
167 167
168 write_fmt_string (printcharfun, "#<%s-console", 168 write_fmt_string (printcharfun, "#<%s-console",
169 !CONSOLE_LIVE_P (con) ? "dead" : CONSOLE_TYPE_NAME (con)); 169 !CONSOLE_LIVE_P (con) ? "dead" : CONSOLE_TYPE_NAME (con));
170 if (CONSOLE_LIVE_P (con) && !NILP (CONSOLE_CONNECTION (con))) 170 if (CONSOLE_LIVE_P (con) && !NILP (CONSOLE_CONNECTION (con)))
171 write_fmt_string_lisp (printcharfun, " on %S", 1, 171 write_fmt_string_lisp (printcharfun, " on %S", 1,
172 CONSOLE_CONNECTION (con)); 172 CONSOLE_CONNECTION (con));
173 write_fmt_string (printcharfun, " 0x%x>", con->header.uid); 173 write_fmt_string (printcharfun, " 0x%x>", NORMAL_LISP_OBJECT_UID (con));
174 } 174 }
175 175
176 DEFINE_NODUMP_LISP_OBJECT ("console", console, mark_console, 176 DEFINE_NODUMP_LISP_OBJECT ("console", console, mark_console,
177 print_console, 0, 0, 0, 177 print_console, 0, 0, 0,
178 console_description, 178 console_description,
1349 1, /* mark bit */ \ 1349 1, /* mark bit */ \
1350 1, /* c_readonly bit */ \ 1350 1, /* c_readonly bit */ \
1351 1 /* lisp_readonly bit */ \ 1351 1 /* lisp_readonly bit */ \
1352 }, \ 1352 }, \
1353 0, /* next */ \ 1353 0, /* next */ \
1354 0, /* uid */ \
1355 0 /* free */ \
1356 }, \ 1354 }, \
1357 &(console_local_flags.field_name), \ 1355 &(console_local_flags.field_name), \
1358 forward_type \ 1356 forward_type \
1359 }, \ 1357 }, \
1360 magicfun \ 1358 magicfun \