Mercurial > emacs

comparison src/data.c @ 45397:bc5d63652a0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* data.c (Fkeywordp, Fsymbol_name, store_symval_forwarding) (Fmake_variable_buffer_local, Fmake_local_variable) (Fmake_variable_frame_local): Use SYMBOL_NAME and XSTRING instead of XSYMBOL and name field.
author Ken Raeburn <raeburn@raeburn.org>
date Mon, 20 May 2002 08:05:21 +0000
parents 093178b691f0
children 5f4ed17e4396
comparison
equal deleted inserted replaced
45396:cab845213388 45397:bc5d63652a0a
309 interned in the initial obarray. */) 309 interned in the initial obarray. */)
310 (object) 310 (object)
311 Lisp_Object object; 311 Lisp_Object object;
312 { 312 {
313 if (SYMBOLP (object) 313 if (SYMBOLP (object)
314 && XSYMBOL (object)->name->data[0] == ':' 314 && XSTRING (SYMBOL_NAME (object))->data[0] == ':'
315 && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object)) 315 && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object))
316 return Qt; 316 return Qt;
317 return Qnil; 317 return Qnil;
318 } 318 }
319 319
677 register Lisp_Object symbol; 677 register Lisp_Object symbol;
678 { 678 {
679 register Lisp_Object name; 679 register Lisp_Object name;
680 680
681 CHECK_SYMBOL (symbol); 681 CHECK_SYMBOL (symbol);
682 XSETSTRING (name, XSYMBOL (symbol)->name); 682 name = SYMBOL_NAME (symbol);
683 return name; 683 return name;
684 } 684 }
685 685
686 DEFUN ("fset", Ffset, Sfset, 2, 2, 0, 686 DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
687 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. */) 687 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. */)
867 case Lisp_Misc_Intfwd: 867 case Lisp_Misc_Intfwd:
868 CHECK_NUMBER (newval); 868 CHECK_NUMBER (newval);
869 *XINTFWD (valcontents)->intvar = XINT (newval); 869 *XINTFWD (valcontents)->intvar = XINT (newval);
870 if (*XINTFWD (valcontents)->intvar != XINT (newval)) 870 if (*XINTFWD (valcontents)->intvar != XINT (newval))
871 error ("Value out of range for variable `%s'", 871 error ("Value out of range for variable `%s'",
872 XSYMBOL (symbol)->name->data); 872 XSTRING (SYMBOL_NAME (symbol))->data);
873 break; 873 break;
874 874
875 case Lisp_Misc_Boolfwd: 875 case Lisp_Misc_Boolfwd:
876 *XBOOLFWD (valcontents)->boolvar = NILP (newval) ? 0 : 1; 876 *XBOOLFWD (valcontents)->boolvar = NILP (newval) ? 0 : 1;
877 break; 877 break;
885 int offset = XBUFFER_OBJFWD (valcontents)->offset; 885 int offset = XBUFFER_OBJFWD (valcontents)->offset;
886 Lisp_Object type; 886 Lisp_Object type;
887 887
888 type = PER_BUFFER_TYPE (offset); 888 type = PER_BUFFER_TYPE (offset);
889 if (XINT (type) == -1) 889 if (XINT (type) == -1)
890 error ("Variable %s is read-only", XSYMBOL (symbol)->name->data); 890 error ("Variable %s is read-only", XSTRING (SYMBOL_NAME (symbol))->data);
891 891
892 if (! NILP (type) && ! NILP (newval) 892 if (! NILP (type) && ! NILP (newval)
893 && XTYPE (newval) != XINT (type)) 893 && XTYPE (newval) != XINT (type))
894 buffer_slot_type_mismatch (offset); 894 buffer_slot_type_mismatch (offset);
895 895
1441 1441
1442 CHECK_SYMBOL (variable); 1442 CHECK_SYMBOL (variable);
1443 1443
1444 valcontents = SYMBOL_VALUE (variable); 1444 valcontents = SYMBOL_VALUE (variable);
1445 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) 1445 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
1446 error ("Symbol %s may not be buffer-local", XSYMBOL (variable)->name->data); 1446 error ("Symbol %s may not be buffer-local", XSTRING (SYMBOL_NAME (variable))->data);
1447 1447
1448 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents)) 1448 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
1449 return variable; 1449 return variable;
1450 if (SOME_BUFFER_LOCAL_VALUEP (valcontents)) 1450 if (SOME_BUFFER_LOCAL_VALUEP (valcontents))
1451 { 1451 {
1494 1494
1495 CHECK_SYMBOL (variable); 1495 CHECK_SYMBOL (variable);
1496 1496
1497 valcontents = SYMBOL_VALUE (variable); 1497 valcontents = SYMBOL_VALUE (variable);
1498 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) 1498 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
1499 error ("Symbol %s may not be buffer-local", XSYMBOL (variable)->name->data); 1499 error ("Symbol %s may not be buffer-local", XSTRING (SYMBOL_NAME (variable))->data);
1500 1500
1501 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents)) 1501 if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
1502 { 1502 {
1503 tem = Fboundp (variable); 1503 tem = Fboundp (variable);
1504 1504
1637 CHECK_SYMBOL (variable); 1637 CHECK_SYMBOL (variable);
1638 1638
1639 valcontents = SYMBOL_VALUE (variable); 1639 valcontents = SYMBOL_VALUE (variable);
1640 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents) 1640 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
1641 || BUFFER_OBJFWDP (valcontents)) 1641 || BUFFER_OBJFWDP (valcontents))
1642 error ("Symbol %s may not be frame-local", XSYMBOL (variable)->name->data); 1642 error ("Symbol %s may not be frame-local", XSTRING (SYMBOL_NAME (variable))->data);
1643 1643
1644 if (BUFFER_LOCAL_VALUEP (valcontents) 1644 if (BUFFER_LOCAL_VALUEP (valcontents)
1645 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) 1645 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
1646 { 1646 {
1647 XBUFFER_LOCAL_VALUE (valcontents)->check_frame = 1; 1647 XBUFFER_LOCAL_VALUE (valcontents)->check_frame = 1;