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

[Stefan Monnier]

Index: emacs/src/data.c
diff -c emacs/src/data.c:1.220 emacs/src/data.c:1.221
*** emacs/src/data.c:1.220      Wed Mar 12 18:46:41 2003
--- emacs/src/data.c    Tue Mar 25 11:30:15 2003
***************
*** 897,906 ****
            int offset = XBUFFER_OBJFWD (valcontents)->offset;
            Lisp_Object type;
  
-           type = PER_BUFFER_TYPE (offset);
-           if (XINT (type) == -1)
-             error ("Variable %s is read-only", SDATA (SYMBOL_NAME (symbol)));
- 
            if (! NILP (type) && ! NILP (newval)
                && XTYPE (newval) != XINT (type))
              buffer_slot_type_mismatch (offset);
--- 897,902 ----
***************
*** 1616,1625 ****
       loaded, recompute its value.  We have to do it now, or else
       forwarded objects won't work right.  */
    {
!     Lisp_Object *pvalbuf;
      valcontents = SYMBOL_VALUE (variable);
      pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer;
!     if (current_buffer == XBUFFER (*pvalbuf))
        {
        *pvalbuf = Qnil;
        XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0;
--- 1612,1622 ----
       loaded, recompute its value.  We have to do it now, or else
       forwarded objects won't work right.  */
    {
!     Lisp_Object *pvalbuf, buf;
      valcontents = SYMBOL_VALUE (variable);
      pvalbuf = &XBUFFER_LOCAL_VALUE (valcontents)->buffer;
!     XSETBUFFER (buf, current_buffer);
!     if (EQ (buf, *pvalbuf))
        {
        *pvalbuf = Qnil;
        XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0;