comparison src/buffer.c @ 9464:4bb620c9a075

(buffer_slot_type_mismatch): Take just the offset as argument. Only check against types that are actually used.

9463:a40af805e036

      }
  for (; CONSP (hit_list); hit_list = XCONS (hit_list)->cdr)
    Fdelete_overlay (XCONS (hit_list)->car);
}

/* Somebody has tried to store NEWVAL into the buffer-local slot with
   offset XUINT (valcontents), and NEWVAL has an unacceptable type.  */
void
buffer_slot_type_mismatch (valcontents, newval)
     Lisp_Object valcontents, newval;
{
  unsigned int offset = XUINT (valcontents);
  unsigned char *symbol_name =
    (XSYMBOL (*(Lisp_Object *)(offset + (char *)&buffer_local_symbols))
     ->name->data);
  char *type_name;
  
  switch (XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_types)))
    {
    case Lisp_Int:	type_name = "integers";  break;
    case Lisp_String:	type_name = "strings";   break;
    case Lisp_Misc:	type_name = "markers";   break;
    case Lisp_Symbol:	type_name = "symbols";   break;
    case Lisp_Cons:	type_name = "lists";     break;
    case Lisp_Vector:	type_name = "vectors";   break;
    default:
      abort ();
    }

  error ("only %s should be stored in the buffer-local variable %s",
	 type_name, symbol_name);
}

init_buffer_once ()
{
  register Lisp_Object tem;

9464:4bb620c9a075

      }
  for (; CONSP (hit_list); hit_list = XCONS (hit_list)->cdr)
    Fdelete_overlay (XCONS (hit_list)->car);
}

/* Somebody has tried to store a value with an unacceptable type
   into the buffer-local slot with offset OFFSET.  */
void
buffer_slot_type_mismatch (offset)
     int offset;
{
  Lisp_Object sym;
  char *type_name;
  sym = *(Lisp_Object *)(offset + (char *)&buffer_local_symbols);
  switch (XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_types)))
    {
    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, XSYMBOL (sym)->name->data);
}

init_buffer_once ()
{
  register Lisp_Object tem;