comparison src/data.c @ 50305:77bee06b14c5

(store_symval_forwarding): Delete special read-only hack for type == -1, since we now use ->constant instead. (Fkill_local_variable): Don't use XBUFFER if it can be nil.

50304:d9d826db650f

	case Lisp_Misc_Buffer_Objfwd:
	  {
	    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);

	    if (buf == NULL)

  /* If the symbol is set up with the current buffer's binding
     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;
	find_symbol_value (variable);
      }

50305:77bee06b14c5

	case Lisp_Misc_Buffer_Objfwd:
	  {
	    int offset = XBUFFER_OBJFWD (valcontents)->offset;
	    Lisp_Object type;

	    if (! NILP (type) && ! NILP (newval)
		&& XTYPE (newval) != XINT (type))
	      buffer_slot_type_mismatch (offset);

	    if (buf == NULL)

  /* If the symbol is set up with the current buffer's binding
     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;
	find_symbol_value (variable);
      }