/[emacs]/emacs/src/data.c
ViewVC logotype

Diff of /emacs/src/data.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.209 by pj, Sat Dec 22 13:58:42 2001 UTC revision 1.210 by raeburn, Mon May 20 08:05:21 2002 UTC
# Line 311  interned in the initial obarray.  */) Line 311  interned in the initial obarray.  */)
311       Lisp_Object object;       Lisp_Object object;
312  {  {
313    if (SYMBOLP (object)    if (SYMBOLP (object)
314        && XSYMBOL (object)->name->data[0] == ':'        && XSTRING (SYMBOL_NAME (object))->data[0] == ':'
315        && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object))        && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object))
316      return Qt;      return Qt;
317    return Qnil;    return Qnil;
# Line 679  DEFUN ("symbol-name", Fsymbol_name, Ssym Line 679  DEFUN ("symbol-name", Fsymbol_name, Ssym
679    register Lisp_Object name;    register Lisp_Object name;
680    
681    CHECK_SYMBOL (symbol);    CHECK_SYMBOL (symbol);
682    XSETSTRING (name, XSYMBOL (symbol)->name);    name = SYMBOL_NAME (symbol);
683    return name;    return name;
684  }  }
685    
# Line 869  store_symval_forwarding (symbol, valcont Line 869  store_symval_forwarding (symbol, valcont
869            *XINTFWD (valcontents)->intvar = XINT (newval);            *XINTFWD (valcontents)->intvar = XINT (newval);
870            if (*XINTFWD (valcontents)->intvar != XINT (newval))            if (*XINTFWD (valcontents)->intvar != XINT (newval))
871              error ("Value out of range for variable `%s'",              error ("Value out of range for variable `%s'",
872                     XSYMBOL (symbol)->name->data);                     XSTRING (SYMBOL_NAME (symbol))->data);
873            break;            break;
874    
875          case Lisp_Misc_Boolfwd:          case Lisp_Misc_Boolfwd:
# Line 887  store_symval_forwarding (symbol, valcont Line 887  store_symval_forwarding (symbol, valcont
887    
888              type = PER_BUFFER_TYPE (offset);              type = PER_BUFFER_TYPE (offset);
889              if (XINT (type) == -1)              if (XINT (type) == -1)
890                error ("Variable %s is read-only", XSYMBOL (symbol)->name->data);                error ("Variable %s is read-only", XSTRING (SYMBOL_NAME (symbol))->data);
891    
892              if (! NILP (type) && ! NILP (newval)              if (! NILP (type) && ! NILP (newval)
893                  && XTYPE (newval) != XINT (type))                  && XTYPE (newval) != XINT (type))
# Line 1443  The function `default-value' gets the de Line 1443  The function `default-value' gets the de
1443    
1444    valcontents = SYMBOL_VALUE (variable);    valcontents = SYMBOL_VALUE (variable);
1445    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
1446      error ("Symbol %s may not be buffer-local", XSYMBOL (variable)->name->data);      error ("Symbol %s may not be buffer-local", XSTRING (SYMBOL_NAME (variable))->data);
1447    
1448    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
1449      return variable;      return variable;
# Line 1496  Instead, use `add-hook' and specify t fo Line 1496  Instead, use `add-hook' and specify t fo
1496    
1497    valcontents = SYMBOL_VALUE (variable);    valcontents = SYMBOL_VALUE (variable);
1498    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
1499      error ("Symbol %s may not be buffer-local", XSYMBOL (variable)->name->data);      error ("Symbol %s may not be buffer-local", XSTRING (SYMBOL_NAME (variable))->data);
1500    
1501    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
1502      {      {
# Line 1639  See `modify-frame-parameters'.  */) Line 1639  See `modify-frame-parameters'.  */)
1639    valcontents = SYMBOL_VALUE (variable);    valcontents = SYMBOL_VALUE (variable);
1640    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
1641        || BUFFER_OBJFWDP (valcontents))        || BUFFER_OBJFWDP (valcontents))
1642      error ("Symbol %s may not be frame-local", XSYMBOL (variable)->name->data);      error ("Symbol %s may not be frame-local", XSTRING (SYMBOL_NAME (variable))->data);
1643    
1644    if (BUFFER_LOCAL_VALUEP (valcontents)    if (BUFFER_LOCAL_VALUEP (valcontents)
1645        || SOME_BUFFER_LOCAL_VALUEP (valcontents))        || SOME_BUFFER_LOCAL_VALUEP (valcontents))

Legend:
Removed from v.1.209  
changed lines
  Added in v.1.210

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26