comparison src/keymap.c @ 88821:690d527d1ad2

(access_keymap): Remove generic char code. (push_key_description): Use CHARACTERP.

88820:2a39da7c94ef

       for this key sequence.  */

    Lisp_Object t_binding;
    t_binding = Qnil;

    /* If `t_ok' is 2, both `t' and generic-char bindings are accepted.
       If it is 1, only generic-char bindings are accepted.
       Otherwise, neither are.  */
    t_ok = t_ok ? 2 : 0;

    for (tail = XCDR (map);
	 (CONSP (tail)
	  || (tail = get_keymap (tail, 0, autoload), CONSP (tail)));

	  {
	    Lisp_Object key = XCAR (binding);
	    
	    if (EQ (key, idx))
	      val = XCDR (binding);
	    else if (t_ok
		     && INTEGERP (idx)
		     && (XINT (idx) & CHAR_MODIFIER_MASK) == 0
		     && INTEGERP (key)
		     && (XINT (key) & CHAR_MODIFIER_MASK) == 0
		     && !SINGLE_BYTE_CHAR_P (XINT (idx))
		     && !SINGLE_BYTE_CHAR_P (XINT (key))
		     && CHAR_VALID_P (XINT (key), 1)
		     && !CHAR_VALID_P (XINT (key), 0)
		     && (CHAR_CHARSET (XINT (key))
			 == CHAR_CHARSET (XINT (idx))))
	      {
		/* KEY is the generic character of the charset of IDX.
		   Use KEY's binding if there isn't a binding for IDX
		   itself.  */
		t_binding = XCDR (binding);
		t_ok = 0;
	      }
	    else if (t_ok > 1 && EQ (key, Qt))
	      {
		t_binding = XCDR (binding);
		t_ok = 1;
	      }

	       && SINGLE_BYTE_CHAR_P (c)
	       && !force_multibyte))
    {
      *p++ = c;
    }
  else if (CHAR_VALID_P (c, 0))
    {
      if (NILP (current_buffer->enable_multibyte_characters))
	*p++ = multibyte_char_to_unibyte (c, Qnil);
      else
	p += CHAR_STRING (c, (unsigned char *) p);

88821:690d527d1ad2

       for this key sequence.  */

    Lisp_Object t_binding;
    t_binding = Qnil;

    /* If `t_ok' is 2, both `t' is accepted.  */
    t_ok = t_ok ? 2 : 0;

    for (tail = XCDR (map);
	 (CONSP (tail)
	  || (tail = get_keymap (tail, 0, autoload), CONSP (tail)));

	  {
	    Lisp_Object key = XCAR (binding);
	    
	    if (EQ (key, idx))
	      val = XCDR (binding);
	    else if (t_ok > 1 && EQ (key, Qt))
	      {
		t_binding = XCDR (binding);
		t_ok = 1;
	      }

	       && SINGLE_BYTE_CHAR_P (c)
	       && !force_multibyte))
    {
      *p++ = c;
    }
  else if (CHARACTERP (c))
    {
      if (NILP (current_buffer->enable_multibyte_characters))
	*p++ = multibyte_char_to_unibyte (c, Qnil);
      else
	p += CHAR_STRING (c, (unsigned char *) p);