Mercurial > hg > xemacs-beta

comparison src/console.c @ 5120:d1247f3cc363 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
latest work on lisp-object workspace; more changes eliminating LCRECORD in place of LISP_OBJECT; now compiles and runs.
author Ben Wing <ben@xemacs.org>
date Mon, 28 Dec 2009 01:15:52 -0600
parents e0db3c197671
children 623d57b7fbe8
comparison
equal deleted inserted replaced
5119:d877c14318b3 5120:d1247f3cc363
202 { 202 {
203 Lisp_Object console = ALLOC_LISP_OBJECT (console); 203 Lisp_Object console = ALLOC_LISP_OBJECT (console);
204 struct console *con = XCONSOLE (console); 204 struct console *con = XCONSOLE (console);
205 struct gcpro gcpro1; 205 struct gcpro gcpro1;
206 206
207 COPY_LCRECORD (con, XCONSOLE (Vconsole_defaults)); 207 COPY_LISP_OBJECT (con, XCONSOLE (Vconsole_defaults));
208 208
209 GCPRO1 (console); 209 GCPRO1 (console);
210 210
211 con->conmeths = decode_console_type (type, ERROR_ME); 211 con->conmeths = decode_console_type (type, ERROR_ME);
212 con->contype = get_console_variant (type); 212 con->contype = get_console_variant (type);
666 } 666 }
667 667
668 static void 668 static void
669 nuke_all_console_slots (struct console *con, Lisp_Object zap) 669 nuke_all_console_slots (struct console *con, Lisp_Object zap)
670 { 670 {
671 ZERO_LCRECORD (con); 671 ZERO_LISP_OBJECT (con);
672 672
673 #define MARKED_SLOT(x) con->x = zap; 673 #define MARKED_SLOT(x) con->x = zap;
674 #include "conslots.h" 674 #include "conslots.h"
675 } 675 }
676 676
1325 /* The docstrings for DEFVAR_* are recorded externally by make-docfile. */ 1325 /* The docstrings for DEFVAR_* are recorded externally by make-docfile. */
1326 #ifdef NEW_GC 1326 #ifdef NEW_GC
1327 #define DEFVAR_CONSOLE_LOCAL_1(lname, field_name, forward_type, magic_fun) \ 1327 #define DEFVAR_CONSOLE_LOCAL_1(lname, field_name, forward_type, magic_fun) \
1328 do { \ 1328 do { \
1329 struct symbol_value_forward *I_hate_C = \ 1329 struct symbol_value_forward *I_hate_C = \
1330 alloc_lrecord_type (struct symbol_value_forward, \ 1330 XSYMBOL_VALUE_FORWARD (ALLOC_LISP_OBJECT (symbol_value_forward)); \
1331 &lrecord_symbol_value_forward); \
1332 /*mcpro ((Lisp_Object) I_hate_C);*/ \ 1331 /*mcpro ((Lisp_Object) I_hate_C);*/ \
1333 \ 1332 \
1334 I_hate_C->magic.value = &(console_local_flags.field_name); \ 1333 I_hate_C->magic.value = &(console_local_flags.field_name); \
1335 I_hate_C->magic.type = forward_type; \ 1334 I_hate_C->magic.type = forward_type; \
1336 I_hate_C->magicfun = magic_fun; \ 1335 I_hate_C->magicfun = magic_fun; \