comparison src/buffer.c @ 95112:0835cb21d60e

* lisp.h (indirect_variable): * data.c (indirect_variable, let_shadows_buffer_binding_p): Use Lisp_Symbol pointers rather than Lisp_Object. Adjust callers. * buffer.c (buffer_slot_type_mismatch): Use wrong-type-argument. To this end, change calling-convention.

95111:f3a094e70d91

     register Lisp_Object variable;
     register Lisp_Object buffer;
{
  register struct buffer *buf;
  register Lisp_Object result;

  CHECK_SYMBOL (variable);
  CHECK_BUFFER (buffer);
  buf = XBUFFER (buffer);

  variable = indirect_variable (variable);

  /* Look in local_var_list */
  result = Fassoc (variable, buf->local_var_alist);
  if (NILP (result))
    {

    {
      Lisp_Object valcontents;
      Lisp_Object current_alist_element;

      /* What binding is loaded right now?  */
      valcontents = SYMBOL_VALUE (variable);
      current_alist_element
	= XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);

      /* The value of the currently loaded binding is not
	 stored in it, but rather in the realvalue slot.


/* Somebody has tried to store a value with an unacceptable type
   in the slot with offset OFFSET.  */

void
buffer_slot_type_mismatch (sym, type)
     Lisp_Object sym;
     int type;
{
  char *type_name;

  switch (type)
    {
    case Lisp_Int:
      type_name = "integers";
      break;

    case Lisp_String:
      type_name = "strings";
      break;

    case Lisp_Symbol:
      type_name = "symbols";
      break;

    default:
      abort ();
    }

  error ("Only %s should be stored in the buffer-local variable %s",
	 type_name, SDATA (SYMBOL_NAME (sym)));
}


/***********************************************************************
			 Allocation with mmap

95112:0835cb21d60e

     register Lisp_Object variable;
     register Lisp_Object buffer;
{
  register struct buffer *buf;
  register Lisp_Object result;
  struct Lisp_Symbol *sym;

  CHECK_SYMBOL (variable);
  CHECK_BUFFER (buffer);
  buf = XBUFFER (buffer);

  sym = indirect_variable (XSYMBOL (variable));
  XSETSYMBOL (variable, sym);

  /* Look in local_var_list */
  result = Fassoc (variable, buf->local_var_alist);
  if (NILP (result))
    {

    {
      Lisp_Object valcontents;
      Lisp_Object current_alist_element;

      /* What binding is loaded right now?  */
      valcontents = sym->value;
      current_alist_element
	= XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);

      /* The value of the currently loaded binding is not
	 stored in it, but rather in the realvalue slot.


/* Somebody has tried to store a value with an unacceptable type
   in the slot with offset OFFSET.  */

void
buffer_slot_type_mismatch (newval, type)
     Lisp_Object newval;
     int type;
{
  Lisp_Object predicate;

  switch (type)
    {
    case Lisp_Int:    predicate = Qintegerp; break;
    case Lisp_String: predicate = Qstringp;  break;
    case Lisp_Symbol: predicate = Qsymbolp;  break;
    default: abort ();
    }

  wrong_type_argument (predicate, newval);
}


/***********************************************************************
			 Allocation with mmap