comparison src/data.c @ 29735:ab56f683df46

(set_internal): If variable is frame-local, store the new value immediately into the frame parameter alist.

29734:afc9d8eb0666

     struct buffer *buf;
     int bindflag;
{
  int voide = EQ (newval, Qunbound);

  register Lisp_Object valcontents, tem1, current_alist_element;

  if (buf == 0)
    buf = current_buffer;

  /* If restoring in a dead buffer, do nothing.  */

  if (NILP (symbol) || EQ (symbol, Qt)
      || (XSYMBOL (symbol)->name->data[0] == ':'
	  && EQ (XSYMBOL (symbol)->obarray, initial_obarray)
	  && !EQ (newval, symbol)))
    return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
  valcontents = XSYMBOL (symbol)->value;

  if (BUFFER_OBJFWDP (valcontents))
    {
      int offset = XBUFFER_OBJFWD (valcontents)->offset;
      int idx = PER_BUFFER_IDX (offset);

	  /* Set `buffer' and `frame' slots for thebinding now loaded.  */
	  XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf);
	  XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame;
	}
      valcontents = XBUFFER_LOCAL_VALUE (valcontents)->realvalue;
    }

  /* If storing void (making the symbol void), forward only through
     buffer-local indicator, not through Lisp_Objfwd, etc.  */
  if (voide)
    store_symval_forwarding (symbol, Qnil, newval);
  else
    store_symval_forwarding (symbol, valcontents, newval);

  return newval;
}

/* Access or set a buffer-local symbol's default value.  */

29735:ab56f683df46

     struct buffer *buf;
     int bindflag;
{
  int voide = EQ (newval, Qunbound);

  register Lisp_Object valcontents, innercontents, tem1, current_alist_element;

  if (buf == 0)
    buf = current_buffer;

  /* If restoring in a dead buffer, do nothing.  */

  if (NILP (symbol) || EQ (symbol, Qt)
      || (XSYMBOL (symbol)->name->data[0] == ':'
	  && EQ (XSYMBOL (symbol)->obarray, initial_obarray)
	  && !EQ (newval, symbol)))
    return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));

  innercontents = valcontents = XSYMBOL (symbol)->value;

  if (BUFFER_OBJFWDP (valcontents))
    {
      int offset = XBUFFER_OBJFWD (valcontents)->offset;
      int idx = PER_BUFFER_IDX (offset);

	  /* Set `buffer' and `frame' slots for thebinding now loaded.  */
	  XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf);
	  XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame;
	}
      innercontents = XBUFFER_LOCAL_VALUE (valcontents)->realvalue;
    }

  /* If storing void (making the symbol void), forward only through
     buffer-local indicator, not through Lisp_Objfwd, etc.  */
  if (voide)
    store_symval_forwarding (symbol, Qnil, newval);
  else
    store_symval_forwarding (symbol, innercontents, newval);

  /* If we just set a variable whose current binding is frame-local,
     store the new value in the frame parameter too.  */

  if (BUFFER_LOCAL_VALUEP (valcontents)
      || SOME_BUFFER_LOCAL_VALUEP (valcontents))
    {
      /* What binding is loaded right now?  */
      current_alist_element
	= XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);

      /* If the current buffer is not the buffer whose binding is
	 loaded, or if there may be frame-local bindings and the frame
	 isn't the right one, or if it's a Lisp_Buffer_Local_Value and
	 the default binding is loaded, the loaded binding may be the
	 wrong one.  */
      if (XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame)
	XCDR (current_alist_element) = newval;
    }

  return newval;
}

/* Access or set a buffer-local symbol's default value.  */