comparison src/keymap.c @ 13771:28790743a5a3

(Fkey_binding): Handle text-property keymaps. Include puresize.h. (store_in_keymap): Check PURE_P (def) and copy if nec.

13770:197ada595605

#include "commands.h"
#include "buffer.h"
#include "keyboard.h"
#include "termhooks.h"
#include "blockinput.h"

#define min(a, b) ((a) < (b) ? (a) : (b))

/* The number of elements in keymap vectors.  */
#define DENSE_TABLE_SIZE (0200)

     register Lisp_Object idx;
     register Lisp_Object def;
{
  /* If we are preparing to dump, and DEF is a menu element
     with a menu item string, copy it to ensure it is not pure.  */
  if (!NILP (Vpurify_flag) && CONSP (def)
      && STRINGP (XCONS (def)->car))
    def = Fcons (XCONS (def)->car, XCONS (def)->cdr);

  if (!CONSP (keymap) || ! EQ (XCONS (keymap)->car, Qkeymap))
    error ("attempt to define a key in a non-keymap");

      if (! NILP (value) && !INTEGERP (value))
	RETURN_UNGCPRO (value);
    }
  else
    { 
      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);
	  }

      if (! NILP (current_buffer->keymap))
	{
	  value = Flookup_key (current_buffer->keymap, key, accept_default);
	  if (! NILP (value) && !INTEGERP (value))
	    RETURN_UNGCPRO (value);
	}
    }

13771:28790743a5a3

#include "commands.h"
#include "buffer.h"
#include "keyboard.h"
#include "termhooks.h"
#include "blockinput.h"
#include "puresize.h"

#define min(a, b) ((a) < (b) ? (a) : (b))

/* The number of elements in keymap vectors.  */
#define DENSE_TABLE_SIZE (0200)

     register Lisp_Object idx;
     register Lisp_Object def;
{
  /* If we are preparing to dump, and DEF is a menu element
     with a menu item string, copy it to ensure it is not pure.  */
  if (CONSP (def) && PURE_P (def) && STRINGP (XCONS (def)->car))
    def = Fcons (XCONS (def)->car, XCONS (def)->cdr);

  if (!CONSP (keymap) || ! EQ (XCONS (keymap)->car, Qkeymap))
    error ("attempt to define a key in a non-keymap");

      if (! NILP (value) && !INTEGERP (value))
	RETURN_UNGCPRO (value);
    }
  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);

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