comparison src/keyboard.c @ 26404:c3c9cc1c2379

Remove USE_TEXT_PROPERTIES.

26403:03830fdf5186

      {
	/* No, so use major and minor mode keymaps.  */
	nmaps = current_minor_maps (NULL, &tmaps);
	maps = (Lisp_Object *) alloca ((nmaps + 2) * sizeof (maps[0]));
	bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
#ifdef USE_TEXT_PROPERTIES
	maps[nmaps++] = get_local_map (PT, current_buffer);
#else
	maps[nmaps++] = current_buffer->keymap;
#endif
      }
    maps[nmaps++] = current_global_map;
  }

  /* Look up in each map the dummy prefix key `menu-bar'.  */

    {
      /* No, so use major and minor mode keymaps.  */
      nmaps = current_minor_maps (NULL, &tmaps);
      maps = (Lisp_Object *) alloca ((nmaps + 2) * sizeof (maps[0]));
      bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
#ifdef USE_TEXT_PROPERTIES
      maps[nmaps++] = get_local_map (PT, current_buffer);
#else
      maps[nmaps++] = current_buffer->keymap;
#endif
    }

  /* Add global keymap at the end.  */
  maps[nmaps++] = current_global_map;

	    submaps = (Lisp_Object *) alloca ((nmaps+2) * sizeof (submaps[0]));
	    defs    = (Lisp_Object *) alloca ((nmaps+2) * sizeof (defs[0]));
	    nmaps_allocated = nmaps + 2;
	  }
	bcopy (maps, submaps, nmaps * sizeof (submaps[0]));
#ifdef USE_TEXT_PROPERTIES
	submaps[nmaps++] = orig_local_map;
#else
	submaps[nmaps++] = current_buffer->keymap;
#endif
      }
    submaps[nmaps++] = current_global_map;
  }

  /* Find an accurate initial value for first_binding.  */

    {
      /* No, so use major and minor mode keymaps.  */
      nmaps = current_minor_maps (NULL, &tmaps);
      maps = (Lisp_Object *) xmalloc ((nmaps + 2) * sizeof (maps[0]));
      bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
#ifdef USE_TEXT_PROPERTIES
      maps[nmaps++] = get_local_map (PT, current_buffer);
#else
      maps[nmaps++] = current_buffer->keymap;
#endif
    }
  maps[nmaps++] = current_global_map;

  *maps_p = maps;
  return nmaps;

26404:c3c9cc1c2379

      {
	/* No, so use major and minor mode keymaps.  */
	nmaps = current_minor_maps (NULL, &tmaps);
	maps = (Lisp_Object *) alloca ((nmaps + 2) * sizeof (maps[0]));
	bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
	maps[nmaps++] = get_local_map (PT, current_buffer);
      }
    maps[nmaps++] = current_global_map;
  }

  /* Look up in each map the dummy prefix key `menu-bar'.  */

    {
      /* No, so use major and minor mode keymaps.  */
      nmaps = current_minor_maps (NULL, &tmaps);
      maps = (Lisp_Object *) alloca ((nmaps + 2) * sizeof (maps[0]));
      bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
      maps[nmaps++] = get_local_map (PT, current_buffer);
    }

  /* Add global keymap at the end.  */
  maps[nmaps++] = current_global_map;

	    submaps = (Lisp_Object *) alloca ((nmaps+2) * sizeof (submaps[0]));
	    defs    = (Lisp_Object *) alloca ((nmaps+2) * sizeof (defs[0]));
	    nmaps_allocated = nmaps + 2;
	  }
	bcopy (maps, submaps, nmaps * sizeof (submaps[0]));
	submaps[nmaps++] = orig_local_map;
      }
    submaps[nmaps++] = current_global_map;
  }

  /* Find an accurate initial value for first_binding.  */

    {
      /* No, so use major and minor mode keymaps.  */
      nmaps = current_minor_maps (NULL, &tmaps);
      maps = (Lisp_Object *) xmalloc ((nmaps + 2) * sizeof (maps[0]));
      bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
      maps[nmaps++] = get_local_map (PT, current_buffer);
    }
  maps[nmaps++] = current_global_map;

  *maps_p = maps;
  return nmaps;