comparison src/keyboard.c @ 4115:4aafcdc3d9e7

(Vhelp_menu_bar_map): Deleted. (menu_bar_items): Move elts for events in Vmenu_bar_final_items to end. (syms_of_keyboard): Corresponding changes.

4114:5746e25610f8

Lisp_Object Vhelp_form;

/* Command to run when the help character follows a prefix key.  */
Lisp_Object Vprefix_help_command;

/* Keymap for items that appear at end of menu bar.  */
Lisp_Object Vhelp_menu_bar_map;

/* Character that causes a quit.  Normally C-g.

   If we are running on an ordinary terminal, this must be an ordinary
   ASCII char, since we want to make it our interrupt character.

  /* maps[0..nmaps-1] are the prefix definitions of KEYBUF[0..t-1]
     in the current keymaps, or nil where it is not a prefix.  */
  Lisp_Object *maps;

  Lisp_Object def, tem;

  Lisp_Object result;

  int mapno;
  Lisp_Object oquit;

      tem = Fkeymapp (def);
      if (!NILP (tem))
	result = menu_bar_one_keymap (def, result);
    }

  result = menu_bar_one_keymap (Vhelp_menu_bar_map, result);

  result = Fnreverse (result);
  Vinhibit_quit = oquit;
  return result;
}

  DEFVAR_LISP ("lucid-menu-bar-dirty-flag", &Vlucid_menu_bar_dirty_flag,
    "t means menu bar, specified Lucid style, needs to be recomputed.");
  Vlucid_menu_bar_dirty_flag = Qnil;

  DEFVAR_LISP ("help-menu-bar-map", &Vhelp_menu_bar_map,
    "Keymap defining global menu items to appear at end of menu bar.");
  Vhelp_menu_bar_map = Qnil;
}

keys_of_keyboard ()
{
  initial_define_key (global_map, Ctl ('Z'), "suspend-emacs");

4115:4aafcdc3d9e7

Lisp_Object Vhelp_form;

/* Command to run when the help character follows a prefix key.  */
Lisp_Object Vprefix_help_command;

/* List of items that should move to the end of the menu bar.  */
Lisp_Object Vmenu_bar_final_items;

/* Character that causes a quit.  Normally C-g.

   If we are running on an ordinary terminal, this must be an ordinary
   ASCII char, since we want to make it our interrupt character.

  /* maps[0..nmaps-1] are the prefix definitions of KEYBUF[0..t-1]
     in the current keymaps, or nil where it is not a prefix.  */
  Lisp_Object *maps;

  Lisp_Object def, tem, tail;

  Lisp_Object result;

  int mapno;
  Lisp_Object oquit;

      tem = Fkeymapp (def);
      if (!NILP (tem))
	result = menu_bar_one_keymap (def, result);
    }

  for (tail = Vmenu_bar_final_items; CONSP (tail); tail = XCONS (tail)->cdr)
    {
      Lisp_Object elt;

      elt = Fassq (XCONS (tail)->car, result);
      if (!NILP (elt))
	result = Fcons (elt, Fdelq (elt, result));
    }

  result = Fnreverse (result);
  Vinhibit_quit = oquit;
  return result;
}

  DEFVAR_LISP ("lucid-menu-bar-dirty-flag", &Vlucid_menu_bar_dirty_flag,
    "t means menu bar, specified Lucid style, needs to be recomputed.");
  Vlucid_menu_bar_dirty_flag = Qnil;

  DEFVAR_LISP ("menu-bar-final-items", &Vmenu_bar_final_items,
    "List of menu bar items to move to the end of the menu bar.\n\
The elements of the listare event types that may have menu bar bindings.");
  Vmenu_bar_final_items = Qnil;
}

keys_of_keyboard ()
{
  initial_define_key (global_map, Ctl ('Z'), "suspend-emacs");