comparison src/keymap.c @ 3632:72cfde0cd8cd

(Fdescribe_vector): Use current buf, not standard-output. (describe_vector_princ): Add newline at end. (store_in_keymap, access_keymap): Use CHAR_META when clearing excess high bits.

3631:0c063224b5d2

  if (XTYPE (idx) == Lisp_Symbol)
    idx = reorder_modifiers (idx);
  else if (INTEGERP (idx))
    /* Clobber the high bits that can be present on a machine
       with more than 24 bits of integer.  */
    XFASTINT (idx) = XINT (idx) & ((1 << 24) - 1);

  {
    Lisp_Object tail;
    Lisp_Object t_binding = Qnil;

  if (XTYPE (idx) == Lisp_Symbol)
    idx = reorder_modifiers (idx);
  else if (INTEGERP (idx))
    /* Clobber the high bits that can be present on a machine
       with more than 24 bits of integer.  */
    XFASTINT (idx) = XINT (idx) & ((1 << 24) - 1);

  /* Scan the keymap for a binding of idx.  */
  {
    Lisp_Object tail;

static int
describe_vector_princ (elt)
     Lisp_Object elt;
{
  Fprinc (elt, Qnil);
}

DEFUN ("describe-vector", Fdescribe_vector, Sdescribe_vector, 1, 1, 0,
  "Print on `standard-output' a description of contents of VECTOR.\n\
This is text showing the elements of vector matched against indices.")
  (vector)
     Lisp_Object vector;
{
  CHECK_VECTOR (vector, 0);
  describe_vector (vector, Qnil, describe_vector_princ, 0, Qnil);
}

describe_vector (vector, elt_prefix, elt_describer, partial, shadow)
     register Lisp_Object vector;
     Lisp_Object elt_prefix;

3632:72cfde0cd8cd

  if (XTYPE (idx) == Lisp_Symbol)
    idx = reorder_modifiers (idx);
  else if (INTEGERP (idx))
    /* Clobber the high bits that can be present on a machine
       with more than 24 bits of integer.  */
    XFASTINT (idx) = XINT (idx) & (CHAR_META | (CHAR_META - 1));

  {
    Lisp_Object tail;
    Lisp_Object t_binding = Qnil;

  if (XTYPE (idx) == Lisp_Symbol)
    idx = reorder_modifiers (idx);
  else if (INTEGERP (idx))
    /* Clobber the high bits that can be present on a machine
       with more than 24 bits of integer.  */
    XFASTINT (idx) = XINT (idx) & (CHAR_META | (CHAR_META - 1));

  /* Scan the keymap for a binding of idx.  */
  {
    Lisp_Object tail;

static int
describe_vector_princ (elt)
     Lisp_Object elt;
{
  Fprinc (elt, Qnil);
  Fterpri (Qnil);
}

DEFUN ("describe-vector", Fdescribe_vector, Sdescribe_vector, 1, 1, 0,
  "Insert a description of contents of VECTOR.\n\
This is text showing the elements of vector matched against indices.")
  (vector)
     Lisp_Object vector;
{
  int count = specpdl_ptr - specpdl;

  specbind (Qstandard_output, Fcurrent_buffer ());
  CHECK_VECTOR (vector, 0);
  describe_vector (vector, Qnil, describe_vector_princ, 0, Qnil);

  return unbind_to (count, Qnil);
}

describe_vector (vector, elt_prefix, elt_describer, partial, shadow)
     register Lisp_Object vector;
     Lisp_Object elt_prefix;