comparison src/keymap.c @ 42510:dde71e46eeeb

(Fcurrent_active_maps): Put the `keymap' property map first. (Fkey_binding): Try the `keymap' property map first. (Fdescribe_buffer_bindings): Show `keymap' property bindings before minor mode bindings.

42509:2a33faa5165e

      local = get_local_map (PT, current_buffer, Qlocal_map);
      if (!NILP (local))
	keymaps = Fcons (local, keymaps);

      local = get_local_map (PT, current_buffer, Qkeymap);
      if (!NILP (local))
	keymaps = Fcons (local, keymaps);

      nmaps = current_minor_maps (0, &maps);

      for (i = --nmaps; i >= 0; i--)
	if (!NILP (maps[i]))
	  keymaps = Fcons (maps[i], keymaps);
    }
  
  return keymaps;
}

    }
  else
    { 
      Lisp_Object local;

      nmaps = current_minor_maps (0, &maps);
      /* Note that all these maps are GCPRO'd
	 in the places where we found them.  */

      for (i = 0; i < nmaps; i++)

	    value = Flookup_key (maps[i], key, accept_default);
	    if (! NILP (value) && !INTEGERP (value))
	      RETURN_UNGCPRO (value);
	  }

      local = get_local_map (PT, current_buffer, Qkeymap);
      if (! NILP (local))
	{
	  value = Flookup_key (local, key, accept_default);
	  if (! NILP (value) && !INTEGERP (value))
	    RETURN_UNGCPRO (value);
	}

      local = get_local_map (PT, current_buffer, Qlocal_map);

      if (! NILP (local))
	{
	  value = Flookup_key (local, key, accept_default);
	  if (! NILP (value) && !INTEGERP (value))
	    RETURN_UNGCPRO (value);

      Fset_buffer (buffer);

      nmaps = current_minor_maps (&modes, &maps);
      Fset_buffer (outbuf);

      /* Print the minor mode maps.  */
      for (i = 0; i < nmaps; i++)
	{
	  /* The title for a minor mode keymap
	     is constructed at run time.

	  describe_map_tree (maps[i], 1, shadow, prefix, title, nomenu, 0, 0);
	  shadow = Fcons (maps[i], shadow);
	}

      start1 = get_local_map (BUF_PT (XBUFFER (buffer)),
			      XBUFFER (buffer), Qkeymap);
      if (!NILP (start1))
	{
	  describe_map_tree (start1, 1, shadow, prefix,
			     "\f\nChar Property Bindings", nomenu, 0, 0);
	  shadow = Fcons (start1, shadow);
	}

      start1 = get_local_map (BUF_PT (XBUFFER (buffer)),
			      XBUFFER (buffer), Qlocal_map);
      if (!NILP (start1))
	{
	  if (EQ (start1, XBUFFER (buffer)->keymap))
	    describe_map_tree (start1, 1, shadow, prefix,
			       "\f\nMajor Mode Bindings", nomenu, 0, 0);
	  else
	    describe_map_tree (start1, 1, shadow, prefix,
			       "\f\nChar Property Bindings", nomenu, 0, 0);

	  shadow = Fcons (start1, shadow);
	}
    }

42510:dde71e46eeeb

      local = get_local_map (PT, current_buffer, Qlocal_map);
      if (!NILP (local))
	keymaps = Fcons (local, keymaps);

      nmaps = current_minor_maps (0, &maps);

      for (i = --nmaps; i >= 0; i--)
	if (!NILP (maps[i]))
	  keymaps = Fcons (maps[i], keymaps);

      local = get_local_map (PT, current_buffer, Qkeymap);
      if (!NILP (local))
	keymaps = Fcons (local, keymaps);
    }
  
  return keymaps;
}

    }
  else
    { 
      Lisp_Object local;

      local = get_local_map (PT, current_buffer, Qkeymap);
      if (! NILP (local))
	{
	  value = Flookup_key (local, key, accept_default);
	  if (! NILP (value) && !INTEGERP (value))
	    RETURN_UNGCPRO (value);
	}

      nmaps = current_minor_maps (0, &maps);
      /* Note that all these maps are GCPRO'd
	 in the places where we found them.  */

      for (i = 0; i < nmaps; i++)

	    value = Flookup_key (maps[i], key, accept_default);
	    if (! NILP (value) && !INTEGERP (value))
	      RETURN_UNGCPRO (value);
	  }

      local = get_local_map (PT, current_buffer, Qlocal_map);
      if (! NILP (local))
	{
	  value = Flookup_key (local, key, accept_default);
	  if (! NILP (value) && !INTEGERP (value))
	    RETURN_UNGCPRO (value);

      Fset_buffer (buffer);

      nmaps = current_minor_maps (&modes, &maps);
      Fset_buffer (outbuf);

      start1 = get_local_map (BUF_PT (XBUFFER (buffer)),
			      XBUFFER (buffer), Qkeymap);
      if (!NILP (start1))
	{
	  describe_map_tree (start1, 1, shadow, prefix,
			     "\f\n`keymap' Property Bindings", nomenu, 0, 0);
	  shadow = Fcons (start1, shadow);
	}

      /* Print the minor mode maps.  */
      for (i = 0; i < nmaps; i++)
	{
	  /* The title for a minor mode keymap
	     is constructed at run time.

	  describe_map_tree (maps[i], 1, shadow, prefix, title, nomenu, 0, 0);
	  shadow = Fcons (maps[i], shadow);
	}

      start1 = get_local_map (BUF_PT (XBUFFER (buffer)),
			      XBUFFER (buffer), Qlocal_map);
      if (!NILP (start1))
	{
	  if (EQ (start1, XBUFFER (buffer)->keymap))
	    describe_map_tree (start1, 1, shadow, prefix,
			       "\f\nMajor Mode Bindings", nomenu, 0, 0);
	  else
	    describe_map_tree (start1, 1, shadow, prefix,
			       "\f\n`local-map' Property Bindings",
			       nomenu, 0, 0);

	  shadow = Fcons (start1, shadow);
	}
    }