[Emacs-diffs] Changes to emacs/src/data.c

[Dave Love]

Index: emacs/src/data.c
diff -c emacs/src/data.c:1.209 emacs/src/data.c:1.210
*** emacs/src/data.c:1.209      Sat Dec 22 08:58:42 2001
--- emacs/src/data.c    Mon May 20 04:05:21 2002
***************
*** 311,317 ****
       Lisp_Object object;
  {
    if (SYMBOLP (object)
!       && XSYMBOL (object)->name->data[0] == ':'
        && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object))
      return Qt;
    return Qnil;
--- 311,317 ----
       Lisp_Object object;
  {
    if (SYMBOLP (object)
!       && XSTRING (SYMBOL_NAME (object))->data[0] == ':'
        && SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object))
      return Qt;
    return Qnil;
***************
*** 679,685 ****
    register Lisp_Object name;
  
    CHECK_SYMBOL (symbol);
!   XSETSTRING (name, XSYMBOL (symbol)->name);
    return name;
  }
  
--- 679,685 ----
    register Lisp_Object name;
  
    CHECK_SYMBOL (symbol);
!   name = SYMBOL_NAME (symbol);
    return name;
  }
  
***************
*** 869,875 ****
          *XINTFWD (valcontents)->intvar = XINT (newval);
          if (*XINTFWD (valcontents)->intvar != XINT (newval))
            error ("Value out of range for variable `%s'",
!                  XSYMBOL (symbol)->name->data);
          break;
  
        case Lisp_Misc_Boolfwd:
--- 869,875 ----
          *XINTFWD (valcontents)->intvar = XINT (newval);
          if (*XINTFWD (valcontents)->intvar != XINT (newval))
            error ("Value out of range for variable `%s'",
!                  XSTRING (SYMBOL_NAME (symbol))->data);
          break;
  
        case Lisp_Misc_Boolfwd:
***************
*** 887,893 ****
  
            type = PER_BUFFER_TYPE (offset);
            if (XINT (type) == -1)
!             error ("Variable %s is read-only", XSYMBOL (symbol)->name->data);
  
            if (! NILP (type) && ! NILP (newval)
                && XTYPE (newval) != XINT (type))
--- 887,893 ----
  
            type = PER_BUFFER_TYPE (offset);
            if (XINT (type) == -1)
!             error ("Variable %s is read-only", XSTRING (SYMBOL_NAME 
(symbol))->data);
  
            if (! NILP (type) && ! NILP (newval)
                && XTYPE (newval) != XINT (type))
***************
*** 1443,1449 ****
  
    valcontents = SYMBOL_VALUE (variable);
    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP 
(valcontents))
!     error ("Symbol %s may not be buffer-local", XSYMBOL 
(variable)->name->data);
  
    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
      return variable;
--- 1443,1449 ----
  
    valcontents = SYMBOL_VALUE (variable);
    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP 
(valcontents))
!     error ("Symbol %s may not be buffer-local", XSTRING (SYMBOL_NAME 
(variable))->data);
  
    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
      return variable;
***************
*** 1496,1502 ****
  
    valcontents = SYMBOL_VALUE (variable);
    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP 
(valcontents))
!     error ("Symbol %s may not be buffer-local", XSYMBOL 
(variable)->name->data);
  
    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
      {
--- 1496,1502 ----
  
    valcontents = SYMBOL_VALUE (variable);
    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP 
(valcontents))
!     error ("Symbol %s may not be buffer-local", XSTRING (SYMBOL_NAME 
(variable))->data);
  
    if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
      {
***************
*** 1639,1645 ****
    valcontents = SYMBOL_VALUE (variable);
    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
        || BUFFER_OBJFWDP (valcontents))
!     error ("Symbol %s may not be frame-local", XSYMBOL 
(variable)->name->data);
  
    if (BUFFER_LOCAL_VALUEP (valcontents)
        || SOME_BUFFER_LOCAL_VALUEP (valcontents))
--- 1639,1645 ----
    valcontents = SYMBOL_VALUE (variable);
    if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
        || BUFFER_OBJFWDP (valcontents))
!     error ("Symbol %s may not be frame-local", XSTRING (SYMBOL_NAME 
(variable))->data);
  
    if (BUFFER_LOCAL_VALUEP (valcontents)
        || SOME_BUFFER_LOCAL_VALUEP (valcontents))