(menu_bar_items, tool_bar_items):

[gnu-emacs] / src / keyboard.c

diff --git a/src/keyboard.c b/src/keyboard.c
index 6c25c3d99ee198a2371b32f3b516ca3c62a1a372..13b93fb390ee383e4f77137a6e7e771700f8c47a 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -70,6 +70,10 @@ Boston, MA 02111-1307, USA.  */
 #include "w32term.h"
 #endif /* HAVE_NTGUI */
 
 #include "w32term.h"
 #endif /* HAVE_NTGUI */
 

+#ifdef macintosh
+#include "macterm.h"
+#endif
+

 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
 #include "systime.h"
 
 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
 #include "systime.h"
 


@@ -93,7 +97,7 @@ extern int input_fd;
 #ifdef HAVE_WINDOW_SYSTEM
 /* Make all keyboard buffers much bigger when using X windows.  */
 #ifdef macintosh
 #ifdef HAVE_WINDOW_SYSTEM
 /* Make all keyboard buffers much bigger when using X windows.  */
 #ifdef macintosh

-/* But not too big (local data > 32K error) if on macintosh */
+/* But not too big (local data > 32K error) if on macintosh.  */

 #define KBD_BUFFER_SIZE 512
 #else
 #define KBD_BUFFER_SIZE 4096
 #define KBD_BUFFER_SIZE 512
 #else
 #define KBD_BUFFER_SIZE 4096


@@ -247,6 +251,10 @@ Lisp_Object Vmenu_bar_final_items;
    If the value is non-nil and not a number, we wait 2 seconds.  */
 Lisp_Object Vsuggest_key_bindings;
 
    If the value is non-nil and not a number, we wait 2 seconds.  */
 Lisp_Object Vsuggest_key_bindings;
 

+/* How long to display an echo-area message when the minibuffer is active.
+   If the value is not a number, such messages don't time out.  */
+Lisp_Object Vminibuffer_message_timeout;
+

 /* Character that causes a quit.  Normally C-g.
 
    If we are running on an ordinary terminal, this must be an ordinary
 /* Character that causes a quit.  Normally C-g.
 
    If we are running on an ordinary terminal, this must be an ordinary


@@ -452,6 +460,10 @@ int input_pending;
 
 int meta_key;
 
 
 int meta_key;
 

+/* Non-zero means force key bindings update in parse_menu_item.  */
+
+int update_menu_bindings;
+

 extern char *pending_malloc_warning;
 
 /* Circular buffer for pre-read keyboard input.  */
 extern char *pending_malloc_warning;
 
 /* Circular buffer for pre-read keyboard input.  */


@@ -935,6 +947,18 @@ This function is called by the editor initialization to begin editing.")
   command_loop_level++;
   update_mode_lines = 1;
 
   command_loop_level++;
   update_mode_lines = 1;
 

+  /* This function may have been called from a debugger called from
+     within redisplay, for instance by Edebugging a function called
+     from fontification-functions.  We want to allow redisplay in
+     the debugging session.
+
+     The recursive edit is left with a `(throw exit ...)'.  The `exit'
+     tag is not caught anywhere in redisplay, i.e. when we leave the
+     recursive edit, the original redisplay leading to the recursive
+     edit will be unwound.  The outcome should therefore be safe.  */
+  specbind (Qinhibit_redisplay, Qnil);
+  redisplaying_p = 0;
+

   record_unwind_protect (recursive_edit_unwind,
                         (command_loop_level
                          && current_buffer != XBUFFER (XWINDOW (selected_window)->buffer))
   record_unwind_protect (recursive_edit_unwind,
                         (command_loop_level
                          && current_buffer != XBUFFER (XWINDOW (selected_window)->buffer))


@@ -1206,7 +1230,7 @@ DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
   if (display_busy_cursor_p)
     cancel_busy_cursor ();
 #endif
   if (display_busy_cursor_p)
     cancel_busy_cursor ();
 #endif

-  Fthrow (Qtop_level, Qnil);
+  return Fthrow (Qtop_level, Qnil);

 }
 
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",
 }
 
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",


@@ -1217,6 +1241,7 @@ DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0,
     Fthrow (Qexit, Qnil);
 
   error ("No recursive edit is in progress");
     Fthrow (Qexit, Qnil);
 
   error ("No recursive edit is in progress");

+  return Qnil;

 }
 
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "",
 }
 
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "",


@@ -1227,6 +1252,7 @@ DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0,
     Fthrow (Qexit, Qt);
 
   error ("No recursive edit is in progress");
     Fthrow (Qexit, Qt);
 
   error ("No recursive edit is in progress");

+  return Qnil;

 }
 \f
 /* This is the actual command reading loop,
 }
 \f
 /* This is the actual command reading loop,


@@ -1247,7 +1273,7 @@ command_loop_1 ()
   int i;
   int no_direct;
   int prev_modiff;
   int i;
   int no_direct;
   int prev_modiff;

-  struct buffer *prev_buffer;
+  struct buffer *prev_buffer = NULL;

 #ifdef MULTI_KBOARD
   int was_locked = single_kboard;
 #endif
 #ifdef MULTI_KBOARD
   int was_locked = single_kboard;
 #endif


@@ -1311,18 +1337,19 @@ command_loop_1 ()
       Vdeactivate_mark = Qnil;
 
       /* If minibuffer on and echo area in use,
       Vdeactivate_mark = Qnil;
 
       /* If minibuffer on and echo area in use,

-        wait 2 sec and redraw minibuffer.  */
+        wait a short time and redraw minibuffer.  */

 
       if (minibuf_level
          && !NILP (echo_area_buffer[0])
 
       if (minibuf_level
          && !NILP (echo_area_buffer[0])

-         && EQ (minibuf_window, echo_area_window))
+         && EQ (minibuf_window, echo_area_window)
+         && NUMBERP (Vminibuffer_message_timeout))

        {
          /* Bind inhibit-quit to t so that C-g gets read in
             rather than quitting back to the minibuffer.  */
          int count = specpdl_ptr - specpdl;
          specbind (Qinhibit_quit, Qt);
 
        {
          /* Bind inhibit-quit to t so that C-g gets read in
             rather than quitting back to the minibuffer.  */
          int count = specpdl_ptr - specpdl;
          specbind (Qinhibit_quit, Qt);
 

-         Fsit_for (make_number (2), Qnil, Qnil);
+         Fsit_for (Vminibuffer_message_timeout, Qnil, Qnil);

          /* Clear the echo area.  */
          message2 (0, 0, 0);
          safe_run_hooks (Qecho_area_clear_hook);
          /* Clear the echo area.  */
          message2 (0, 0, 0);
          safe_run_hooks (Qecho_area_clear_hook);


@@ -1954,10 +1981,10 @@ show_help_echo (help, window, object, pos, ok_to_overwrite_keystroke_echo)
          args[1] = window;
          args[2] = object;
          args[3] = pos;
          args[1] = window;
          args[2] = object;
          args[3] = pos;

-         help = call_function (4, args);
+         help = safe_call (4, args);

        }
       else
        }
       else

-       help = eval_form (help);
+       help = safe_eval (help);

       
       if (!STRINGP (help))
        return;
       
       if (!STRINGP (help))
        return;


@@ -1979,13 +2006,15 @@ show_help_echo (help, window, object, pos, ok_to_overwrite_keystroke_echo)
            {
              int count = specpdl_ptr - specpdl;
              specbind (Qmessage_truncate_lines, Qt);
            {
              int count = specpdl_ptr - specpdl;
              specbind (Qmessage_truncate_lines, Qt);

-             message3_nolog (help, XSTRING (help)->size,
+             message3_nolog (help, STRING_BYTES (XSTRING (help)),

                              STRING_MULTIBYTE (help));
              unbind_to (count, Qnil);
            }
          else
                              STRING_MULTIBYTE (help));
              unbind_to (count, Qnil);
            }
          else

-           message (0);
+             message (0);

        }
        }

+      
+      help_echo_showing_p = STRINGP (help);

     }
 }
 
     }
 }
 


@@ -2029,15 +2058,15 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
      Lisp_Object prev_event;
      int *used_mouse_menu;
 {
      Lisp_Object prev_event;
      int *used_mouse_menu;
 {

-  Lisp_Object c;
+  volatile Lisp_Object c;

   int count;
   jmp_buf local_getcjmp;
   jmp_buf save_jump;
   int count;
   jmp_buf local_getcjmp;
   jmp_buf save_jump;

-  int key_already_recorded = 0;
+  volatile int key_already_recorded = 0;

   Lisp_Object tem, save;
   Lisp_Object tem, save;

-  Lisp_Object previous_echo_area_message;
-  Lisp_Object also_record;
-  int reread;
+  volatile Lisp_Object previous_echo_area_message;
+  volatile Lisp_Object also_record;
+  volatile int reread;

   struct gcpro gcpro1, gcpro2;
 
   also_record = Qnil;
   struct gcpro gcpro1, gcpro2;
 
   also_record = Qnil;


@@ -2169,7 +2198,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
       /* Redisplay if no pending input.  */
       while (!input_pending)
        {
       /* Redisplay if no pending input.  */
       while (!input_pending)
        {

-         redisplay ();
+         if (help_echo_showing_p && !EQ (selected_window, minibuf_window))
+           redisplay_preserve_echo_area ();
+         else
+           redisplay ();

 
          if (!input_pending)
            /* Normal case: no input arrived during redisplay.  */
 
          if (!input_pending)
            /* Normal case: no input arrived during redisplay.  */


@@ -2477,6 +2509,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
       /* Actually read a character, waiting if necessary.  */
       save_getcjmp (save_jump);
       restore_getcjmp (local_getcjmp);
       /* Actually read a character, waiting if necessary.  */
       save_getcjmp (save_jump);
       restore_getcjmp (local_getcjmp);

+      timer_start_idle ();

       c = kbd_buffer_get_event (&kb, used_mouse_menu);
       restore_getcjmp (save_jump);
 
       c = kbd_buffer_get_event (&kb, used_mouse_menu);
       restore_getcjmp (save_jump);
 


@@ -2523,7 +2556,6 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
  non_reread:
 
   timer_stop_idle ();
  non_reread:
 
   timer_stop_idle ();

-

   start_polling ();
 
   if (NILP (c))
   start_polling ();
 
   if (NILP (c))


@@ -2547,8 +2579,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
      and loop around to read another event.  */
   save = Vquit_flag;
   Vquit_flag = Qnil;
      and loop around to read another event.  */
   save = Vquit_flag;
   Vquit_flag = Qnil;

-  tem = get_keyelt (access_keymap (get_keymap_1 (Vspecial_event_map, 0, 0),
-                                  c, 0, 0), 1);
+  tem = access_keymap (get_keymap (Vspecial_event_map, 0, 1), c, 0, 0, 1);

   Vquit_flag = save;
 
   if (!NILP (tem))
   Vquit_flag = save;
 
   if (!NILP (tem))


@@ -2860,11 +2891,46 @@ static void
 record_char (c)
      Lisp_Object c;
 {
 record_char (c)
      Lisp_Object c;
 {

-  total_keys++;
-  XVECTOR (recent_keys)->contents[recent_keys_index] = c;
-  if (++recent_keys_index >= NUM_RECENT_KEYS)
-    recent_keys_index = 0;
+  Lisp_Object help;
+
+  /* Don't record `help-echo' in recent_keys unless it shows some help
+     message, and a different help than the previoiusly recorded
+     event.  */
+  if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
+    {
+      Lisp_Object help;

 
 

+      help = Fnth (make_number (2), c);
+      if (STRINGP (help))
+       {
+         int last_idx;
+         Lisp_Object last_c, last_help;
+         
+         last_idx = recent_keys_index - 1;
+         if (last_idx < 0)
+           last_idx = NUM_RECENT_KEYS - 1;
+         last_c = AREF (recent_keys, last_idx);
+         
+         if (!CONSP (last_c)
+             || !EQ (XCAR (last_c), Qhelp_echo)
+             || (last_help = Fnth (make_number (2), last_c),
+                 !EQ (last_help, help)))
+           {
+             total_keys++;
+             ASET (recent_keys, recent_keys_index, c);
+             if (++recent_keys_index >= NUM_RECENT_KEYS)
+               recent_keys_index = 0;
+           }
+       }
+    }
+  else
+    {
+      total_keys++;
+      ASET (recent_keys, recent_keys_index, c);
+      if (++recent_keys_index >= NUM_RECENT_KEYS)
+       recent_keys_index = 0;
+    }
+      

   /* Write c to the dribble file.  If c is a lispy event, write
      the event's symbol to the dribble file, in <brackets>.  Bleaugh.
      If you, dear reader, have a better idea, you've got the source.  :-) */
   /* Write c to the dribble file.  If c is a lispy event, write
      the event's symbol to the dribble file, in <brackets>.  Bleaugh.
      If you, dear reader, have a better idea, you've got the source.  :-) */


@@ -2897,7 +2963,8 @@ record_char (c)
       fflush (dribble);
     }
 
       fflush (dribble);
     }
 

-  store_kbd_macro_char (c);
+  if (!CONSP (c) || !EQ (Qhelp_echo, XCAR (c)))
+    store_kbd_macro_char (c);

 
   num_nonmacro_input_events++;
 }
 
   num_nonmacro_input_events++;
 }


@@ -3186,7 +3253,7 @@ kbd_buffer_store_event (event)
 }
 
 
 }
 
 

-/* Generate HELP_EVENT input_events in BUFP which has roon for
+/* Generate HELP_EVENT input_events in BUFP which has room for

    SIZE events.  If there's not enough room in BUFP, ignore this
    event.
 
    SIZE events.  If there's not enough room in BUFP, ignore this
    event.
 


@@ -3452,7 +3519,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
          abort ();
 #endif
        }
          abort ();
 #endif
        }

-#if defined (HAVE_X11) || defined (HAVE_NTGUI)
+#if defined (HAVE_X11) || defined (HAVE_NTGUI) || defined (macintosh)

       else if (event->kind == delete_window_event)
        {
          /* Make an event (delete-frame (FRAME)).  */
       else if (event->kind == delete_window_event)
        {
          /* Make an event (delete-frame (FRAME)).  */


@@ -3460,6 +3527,8 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
          obj = Fcons (Qdelete_frame, Fcons (obj, Qnil));
          kbd_fetch_ptr = event + 1;
        }
          obj = Fcons (Qdelete_frame, Fcons (obj, Qnil));
          kbd_fetch_ptr = event + 1;
        }

+#endif
+#if defined (HAVE_X11) || defined (HAVE_NTGUI)

       else if (event->kind == iconify_event)
        {
          /* Make an event (iconify-frame (FRAME)).  */
       else if (event->kind == iconify_event)
        {
          /* Make an event (iconify-frame (FRAME)).  */


@@ -3481,7 +3550,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
          XSETBUFFER (obj, current_buffer);
          kbd_fetch_ptr = event + 1;
        }
          XSETBUFFER (obj, current_buffer);
          kbd_fetch_ptr = event + 1;
        }

-#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
+#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)

       else if (event->kind == menu_bar_activate_event)
        {
          kbd_fetch_ptr = event + 1;
       else if (event->kind == menu_bar_activate_event)
        {
          kbd_fetch_ptr = event + 1;


@@ -3812,7 +3881,7 @@ timer_check (do_it_now)
   while (CONSP (timers) || CONSP (idle_timers))
     {
       Lisp_Object *vector;
   while (CONSP (timers) || CONSP (idle_timers))
     {
       Lisp_Object *vector;

-      Lisp_Object timer, idle_timer;
+      Lisp_Object timer = Qnil, idle_timer = Qnil;

       EMACS_TIME timer_time, idle_timer_time;
       EMACS_TIME difference, timer_difference, idle_timer_difference;
 
       EMACS_TIME timer_time, idle_timer_time;
       EMACS_TIME difference, timer_difference, idle_timer_difference;
 


@@ -4564,6 +4633,8 @@ make_lispy_event (event)
        Lisp_Object *start_pos_ptr;
        Lisp_Object start_pos;
 
        Lisp_Object *start_pos_ptr;
        Lisp_Object start_pos;
 

+       position = Qnil;
+

        /* Build the position as appropriate for this mouse click.  */
        if (event->kind == mouse_click)
          {
        /* Build the position as appropriate for this mouse click.  */
        if (event->kind == mouse_click)
          {


@@ -4669,7 +4740,7 @@ make_lispy_event (event)
 
                if (part == 1 || part == 3)
                  {
 
                if (part == 1 || part == 3)
                  {

-                   /* Mode line or top line.  Look for a string under
+                   /* Mode line or header line.  Look for a string under

                       the mouse that may have a `local-map' property.  */
                    Lisp_Object string;
                    int charpos;
                       the mouse that may have a `local-map' property.  */
                    Lisp_Object string;
                    int charpos;


@@ -4940,7 +5011,8 @@ make_lispy_event (event)
          return Qnil;
        pixel_to_glyph_coords (f, XINT (event->x), XINT (event->y),
                               &column, &row, NULL, 1);
          return Qnil;
        pixel_to_glyph_coords (f, XINT (event->x), XINT (event->y),
                               &column, &row, NULL, 1);

-       window = window_from_coordinates (f, column, row, &part, 0);
+       window = window_from_coordinates (f, XINT (event->x),
+                                          XINT (event->y), &part, 0);

 
        if (!WINDOWP (window))
          {
 
        if (!WINDOWP (window))
          {


@@ -4998,7 +5070,6 @@ make_lispy_event (event)
        Lisp_Object window;
        Lisp_Object posn;
        Lisp_Object files;
        Lisp_Object window;
        Lisp_Object posn;
        Lisp_Object files;

-       int row, column;

 
        /* The frame_or_window field should be a cons of the frame in
           which the event occurred and a list of the filenames
 
        /* The frame_or_window field should be a cons of the frame in
           which the event occurred and a list of the filenames


@@ -5013,9 +5084,9 @@ make_lispy_event (event)
           have been deleted.  */
        if (! FRAME_LIVE_P (f))
          return Qnil;
           have been deleted.  */
        if (! FRAME_LIVE_P (f))
          return Qnil;

-       pixel_to_glyph_coords (f, XINT (event->x), XINT (event->y),
-                              &column, &row, NULL, 1);
-       window = window_from_coordinates (f, column, row, &part, 0);
+
+       window = window_from_coordinates (f, XINT (event->x),
+                                          XINT (event->y), &part, 0);

 
        if (!WINDOWP (window))
          {
 
        if (!WINDOWP (window))
          {


@@ -5069,7 +5140,7 @@ make_lispy_event (event)
       }
 #endif /* HAVE_MOUSE */
 
       }
 #endif /* HAVE_MOUSE */
 

-#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
+#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)

     case MENU_BAR_EVENT:
       if (EQ (event->arg, event->frame_or_window))
        /* This is the prefix key.  We translate this to
     case MENU_BAR_EVENT:
       if (EQ (event->arg, event->frame_or_window))
        /* This is the prefix key.  We translate this to


@@ -5690,7 +5761,10 @@ has the same base event type and all the specified modifiers.")
   else if (SYMBOLP (base))
     return apply_modifiers (modifiers, base);
   else
   else if (SYMBOLP (base))
     return apply_modifiers (modifiers, base);
   else

-    error ("Invalid base event");
+    {
+      error ("Invalid base event");
+      return Qnil;
+    }

 }
 
 /* Try to recognize SYMBOL as a modifier name.
 }
 
 /* Try to recognize SYMBOL as a modifier name.


@@ -5786,6 +5860,12 @@ lucid_event_type_list_p (object)
   if (! CONSP (object))
     return 0;
 
   if (! CONSP (object))
     return 0;
 

+  if (EQ (XCAR (object), Qhelp_echo)
+      || EQ (XCAR (object), Qvertical_line)
+      || EQ (XCAR (object), Qmode_line)
+      || EQ (XCAR (object), Qheader_line))
+    return 0;
+

   for (tail = object; CONSP (tail); tail = XCDR (tail))
     {
       Lisp_Object elt;
   for (tail = object; CONSP (tail); tail = XCDR (tail))
     {
       Lisp_Object elt;


@@ -6127,8 +6207,8 @@ map_prompt (map)
   return Qnil;
 }
 
   return Qnil;
 }
 

-static void menu_bar_item ();
-static void menu_bar_one_keymap ();
+static void menu_bar_item P_ ((Lisp_Object, Lisp_Object));
+static void menu_bar_one_keymap P_ ((Lisp_Object));

 
 /* These variables hold the vector under construction within
    menu_bar_items and its subroutines, and the current index
 
 /* These variables hold the vector under construction within
    menu_bar_items and its subroutines, and the current index


@@ -6213,7 +6293,7 @@ menu_bar_items (old)
                                       * sizeof (maps[0]));
        bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
        if (!NILP (map))
                                       * sizeof (maps[0]));
        bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
        if (!NILP (map))

-         maps[nmaps++] = get_local_map (PT, current_buffer, keymap);
+         maps[nmaps++] = map;

        maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
       }
     maps[nmaps++] = current_global_map;
        maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
       }
     maps[nmaps++] = current_global_map;


@@ -6224,16 +6304,13 @@ menu_bar_items (old)
   result = Qnil;
 
   for (mapno = nmaps - 1; mapno >= 0; mapno--)
   result = Qnil;
 
   for (mapno = nmaps - 1; mapno >= 0; mapno--)

-    {
-      if (! NILP (maps[mapno]))
-       def = get_keyelt (access_keymap (maps[mapno], Qmenu_bar, 1, 0), 0);
-      else
-       def = Qnil;
-
-      tem = Fkeymapp (def);
-      if (!NILP (tem))
-       menu_bar_one_keymap (def);
-    }
+    if (!NILP (maps[mapno]))
+      {
+       def = get_keymap (access_keymap (maps[mapno], Qmenu_bar, 1, 0, 1),
+                         0, 1);
+       if (CONSP (def))
+         menu_bar_one_keymap (def);
+      }

 
   /* Move to the end those items that should be at the end.  */
 
 
   /* Move to the end those items that should be at the end.  */
 


@@ -6346,29 +6423,27 @@ menu_bar_item (key, item)
                     &XVECTOR (menu_bar_items_vector)->contents[i],
                     (menu_bar_items_index - i - 4) * sizeof (Lisp_Object));
            menu_bar_items_index -= 4;
                     &XVECTOR (menu_bar_items_vector)->contents[i],
                     (menu_bar_items_index - i - 4) * sizeof (Lisp_Object));
            menu_bar_items_index -= 4;

-           return;

          }
          }

-
-      /* If there's no definition for this key yet,
-        just ignore `undefined'.  */
-      return;

     }
 
     }
 

-  GCPRO1 (key);                        /* Is this necessary? */
-  i = parse_menu_item (item, 0, 1);
-  UNGCPRO;
-  if (!i)
-    return;
-

   /* If this keymap has already contributed to this KEY,
      don't contribute to it a second time.  */
   tem = Fmemq (key, menu_bar_one_keymap_changed_items);
   /* If this keymap has already contributed to this KEY,
      don't contribute to it a second time.  */
   tem = Fmemq (key, menu_bar_one_keymap_changed_items);

-  if (!NILP (tem))
+  if (!NILP (tem) || NILP (item))

     return;
 
   menu_bar_one_keymap_changed_items
     = Fcons (key, menu_bar_one_keymap_changed_items);
 
     return;
 
   menu_bar_one_keymap_changed_items
     = Fcons (key, menu_bar_one_keymap_changed_items);
 

+  /* We add to menu_bar_one_keymap_changed_items before doing the
+     parse_menu_item, so that if it turns out it wasn't a menu item,
+     it still correctly hides any further menu item.  */
+  GCPRO1 (key);
+  i = parse_menu_item (item, 0, 1);
+  UNGCPRO;
+  if (!i)
+    return;
+

   item = XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF];
 
   /* Find any existing item for this KEY.  */
   item = XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF];
 
   /* Find any existing item for this KEY.  */


@@ -6470,11 +6545,11 @@ parse_menu_item (item, notreal, inmenubar)
 
   /* Initialize optional entries.  */
   for (i = ITEM_PROPERTY_DEF; i < ITEM_PROPERTY_ENABLE; i++)
 
   /* Initialize optional entries.  */
   for (i = ITEM_PROPERTY_DEF; i < ITEM_PROPERTY_ENABLE; i++)

-    XVECTOR (item_properties)->contents[i] = Qnil;
-  XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE] = Qt;
+    AREF (item_properties, i) = Qnil;
+  AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt;

         
   /* Save the item here to protect it from GC.  */
         
   /* Save the item here to protect it from GC.  */

-  XVECTOR (item_properties)->contents[ITEM_PROPERTY_ITEM] = item;
+  AREF (item_properties, ITEM_PROPERTY_ITEM) = item;

 
   item_string = XCAR (item);
 
 
   item_string = XCAR (item);
 


@@ -6483,13 +6558,12 @@ parse_menu_item (item, notreal, inmenubar)
   if (STRINGP (item_string))
     {
       /* Old format menu item.  */
   if (STRINGP (item_string))
     {
       /* Old format menu item.  */

-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME] = item_string;
+      AREF (item_properties, ITEM_PROPERTY_NAME) = item_string;

 
       /* Maybe help string.  */
       if (CONSP (item) && STRINGP (XCAR (item)))
        {
 
       /* Maybe help string.  */
       if (CONSP (item) && STRINGP (XCAR (item)))
        {

-         XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]
-           = XCAR (item);
+         AREF (item_properties, ITEM_PROPERTY_HELP) = XCAR (item);

          start = item;
          item = XCDR (item);
        }
          start = item;
          item = XCDR (item);
        }


@@ -6504,27 +6578,25 @@ parse_menu_item (item, notreal, inmenubar)
        }
       
       /* This is the real definition--the function to run.  */
        }
       
       /* This is the real definition--the function to run.  */

-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF] = item;
+      AREF (item_properties, ITEM_PROPERTY_DEF) = item;

 
       /* Get enable property, if any.  */
       if (SYMBOLP (item))
        {
          tem = Fget (item, Qmenu_enable);
          if (!NILP (tem))
 
       /* Get enable property, if any.  */
       if (SYMBOLP (item))
        {
          tem = Fget (item, Qmenu_enable);
          if (!NILP (tem))

-           XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE] = tem;
+           AREF (item_properties, ITEM_PROPERTY_ENABLE) = tem;

        }
     }
   else if (EQ (item_string, Qmenu_item) && CONSP (item))
     {
       /* New format menu item.  */
        }
     }
   else if (EQ (item_string, Qmenu_item) && CONSP (item))
     {
       /* New format menu item.  */

-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]
-       = XCAR (item);
+      AREF (item_properties, ITEM_PROPERTY_NAME) = XCAR (item);

       start = XCDR (item);
       if (CONSP (start))
        {
          /* We have a real binding.  */
       start = XCDR (item);
       if (CONSP (start))
        {
          /* We have a real binding.  */

-         XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF]
-           = XCAR (start);
+         AREF (item_properties, ITEM_PROPERTY_DEF) = XCAR (start);

 
          item = XCDR (start);
          /* Is there a cache list with key equivalences. */
 
          item = XCDR (start);
          /* Is there a cache list with key equivalences. */


@@ -6541,8 +6613,7 @@ parse_menu_item (item, notreal, inmenubar)
              item = XCDR (item);
 
              if (EQ (tem, QCenable))
              item = XCDR (item);
 
              if (EQ (tem, QCenable))

-               XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE]
-                 = XCAR (item);
+               AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item);

              else if (EQ (tem, QCvisible) && !notreal)
                {
                  /* If got a visible property and that evaluates to nil
              else if (EQ (tem, QCvisible) && !notreal)
                {
                  /* If got a visible property and that evaluates to nil


@@ -6552,8 +6623,7 @@ parse_menu_item (item, notreal, inmenubar)
                    return 0;
                }
              else if (EQ (tem, QChelp))
                    return 0;
                }
              else if (EQ (tem, QChelp))

-               XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]
-                 = XCAR (item);
+               AREF (item_properties, ITEM_PROPERTY_HELP) = XCAR (item);

              else if (EQ (tem, QCfilter))
                filter = item;
              else if (EQ (tem, QCkey_sequence))
              else if (EQ (tem, QCfilter))
                filter = item;
              else if (EQ (tem, QCkey_sequence))


@@ -6568,8 +6638,7 @@ parse_menu_item (item, notreal, inmenubar)
                {
                  tem = XCAR (item);
                  if (CONSP (tem) || (STRINGP (tem) && NILP (cachelist)))
                {
                  tem = XCAR (item);
                  if (CONSP (tem) || (STRINGP (tem) && NILP (cachelist)))

-                   XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ]
-                     = tem;
+                   AREF (item_properties, ITEM_PROPERTY_KEYEQ) = tem;

                }
              else if (EQ (tem, QCbutton) && CONSP (XCAR (item)))
                {
                }
              else if (EQ (tem, QCbutton) && CONSP (XCAR (item)))
                {


@@ -6578,9 +6647,9 @@ parse_menu_item (item, notreal, inmenubar)
                  type = XCAR (tem);
                  if (EQ (type, QCtoggle) || EQ (type, QCradio))
                    {
                  type = XCAR (tem);
                  if (EQ (type, QCtoggle) || EQ (type, QCradio))
                    {

-                     XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED]
+                     AREF (item_properties, ITEM_PROPERTY_SELECTED)

                        = XCDR (tem);
                        = XCDR (tem);

-                     XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE]
+                     AREF (item_properties, ITEM_PROPERTY_TYPE)

                        = type;
                    }
                }
                        = type;
                    }
                }


@@ -6595,23 +6664,23 @@ parse_menu_item (item, notreal, inmenubar)
 
   /* If item string is not a string, evaluate it to get string.
      If we don't get a string, skip this item.  */
 
   /* If item string is not a string, evaluate it to get string.
      If we don't get a string, skip this item.  */

-  item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME];
+  item_string = AREF (item_properties, ITEM_PROPERTY_NAME);

   if (!(STRINGP (item_string) || notreal))
     {
       item_string = menu_item_eval_property (item_string);
       if (!STRINGP (item_string))
        return 0;
   if (!(STRINGP (item_string) || notreal))
     {
       item_string = menu_item_eval_property (item_string);
       if (!STRINGP (item_string))
        return 0;

-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME] = item_string;
+      AREF (item_properties, ITEM_PROPERTY_NAME) = item_string;

     }
      
   /* If got a filter apply it on definition.  */
     }
      
   /* If got a filter apply it on definition.  */

-  def = XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF];
+  def = AREF (item_properties, ITEM_PROPERTY_DEF);

   if (!NILP (filter))
     {
       def = menu_item_eval_property (list2 (XCAR (filter),
                                            list2 (Qquote, def)));
 
   if (!NILP (filter))
     {
       def = menu_item_eval_property (list2 (XCAR (filter),
                                            list2 (Qquote, def)));
 

-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF] = def;
+      AREF (item_properties, ITEM_PROPERTY_DEF) = def;

     }
 
   /* If we got no definition, this item is just unselectable text which
     }
 
   /* If we got no definition, this item is just unselectable text which


@@ -6620,7 +6689,7 @@ parse_menu_item (item, notreal, inmenubar)
     return (inmenubar ? 0 : 1);
  
   /* Enable or disable selection of item.  */
     return (inmenubar ? 0 : 1);
  
   /* Enable or disable selection of item.  */

-  tem = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE];
+  tem = AREF (item_properties, ITEM_PROPERTY_ENABLE);

   if (!EQ (tem, Qt))
     {
       if (notreal)
   if (!EQ (tem, Qt))
     {
       if (notreal)


@@ -6629,19 +6698,20 @@ parse_menu_item (item, notreal, inmenubar)
        tem = menu_item_eval_property (tem);
       if (inmenubar && NILP (tem))
        return 0;               /* Ignore disabled items in menu bar.  */
        tem = menu_item_eval_property (tem);
       if (inmenubar && NILP (tem))
        return 0;               /* Ignore disabled items in menu bar.  */

-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE] = tem;
+      AREF (item_properties, ITEM_PROPERTY_ENABLE) = tem;

     }
 
   /* See if this is a separate pane or a submenu.  */
     }
 
   /* See if this is a separate pane or a submenu.  */

-  def = XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF];
-  tem = get_keymap_1 (def, 0, 1);
+  def = AREF (item_properties, ITEM_PROPERTY_DEF);
+  tem = get_keymap (def, 0, 1);

   /* For a subkeymap, just record its details and exit.  */
   /* For a subkeymap, just record its details and exit.  */

-  if (!NILP (tem))
+  if (CONSP (tem))

     {
     {

-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP] = tem;
-      XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF] = tem;
+      AREF (item_properties, ITEM_PROPERTY_MAP) = tem;
+      AREF (item_properties, ITEM_PROPERTY_DEF) = tem;

       return 1;
     }
       return 1;
     }

+  

   /* At the top level in the menu bar, do likewise for commands also.
      The menu bar does not display equivalent key bindings anyway.
      ITEM_PROPERTY_DEF is already set up properly.  */
   /* At the top level in the menu bar, do likewise for commands also.
      The menu bar does not display equivalent key bindings anyway.
      ITEM_PROPERTY_DEF is already set up properly.  */


@@ -6656,7 +6726,7 @@ parse_menu_item (item, notreal, inmenubar)
       XCDR (start) = Fcons (Fcons (Qnil, Qnil), XCDR (start));
       cachelist = XCAR (XCDR (start));
       newcache = 1;
       XCDR (start) = Fcons (Fcons (Qnil, Qnil), XCDR (start));
       cachelist = XCAR (XCDR (start));
       newcache = 1;

-      tem = XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ];
+      tem = AREF (item_properties, ITEM_PROPERTY_KEYEQ);

       if (!NILP (keyhint))
        {
          XCAR (cachelist) = XCAR (keyhint);
       if (!NILP (keyhint))
        {
          XCAR (cachelist) = XCAR (keyhint);


@@ -6668,6 +6738,7 @@ parse_menu_item (item, notreal, inmenubar)
          XCAR (cachelist) = Qt;
        }
     }
          XCAR (cachelist) = Qt;
        }
     }

+  

   tem = XCAR (cachelist);
   if (!EQ (tem, Qt))
     {
   tem = XCAR (cachelist);
   if (!EQ (tem, Qt))
     {


@@ -6677,21 +6748,22 @@ parse_menu_item (item, notreal, inmenubar)
       if (!NILP (tem))
        tem = Fkey_binding (tem, Qnil);
 
       if (!NILP (tem))
        tem = Fkey_binding (tem, Qnil);
 

-      prefix = XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ];
+      prefix = AREF (item_properties, ITEM_PROPERTY_KEYEQ);

       if (CONSP (prefix))
        {
          def = XCAR (prefix);
          prefix = XCDR (prefix);
        }
       else
       if (CONSP (prefix))
        {
          def = XCAR (prefix);
          prefix = XCDR (prefix);
        }
       else

-       def = XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF];
+       def = AREF (item_properties, ITEM_PROPERTY_DEF);

 
 

-      if (NILP (XCAR (cachelist))) /* Have no saved key.  */
+      if (!update_menu_bindings)
+       chkcache = 0;
+      else if (NILP (XCAR (cachelist))) /* Have no saved key.  */

        {
          if (newcache          /* Always check first time.  */
              /* Should we check everything when precomputing key
                 bindings?  */
        {
          if (newcache          /* Always check first time.  */
              /* Should we check everything when precomputing key
                 bindings?  */

-             /* || notreal */

              /* If something had no key binding before, don't recheck it
                 because that is too slow--except if we have a list of
                 rebound commands in Vdefine_key_rebound_commands, do
              /* If something had no key binding before, don't recheck it
                 because that is too slow--except if we have a list of
                 rebound commands in Vdefine_key_rebound_commands, do


@@ -6716,7 +6788,8 @@ parse_menu_item (item, notreal, inmenubar)
             command name has equivalent keys.  Otherwise look up the
             specified command itself.  We don't try both, because that
             makes lmenu menus slow. */
             command name has equivalent keys.  Otherwise look up the
             specified command itself.  We don't try both, because that
             makes lmenu menus slow. */

-         if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)
+         if (SYMBOLP (def)
+             && SYMBOLP (XSYMBOL (def)->function)

              && ! NILP (Fget (def, Qmenu_alias)))
            def = XSYMBOL (def)->function;
          tem = Fwhere_is_internal (def, Qnil, Qt, Qnil);
              && ! NILP (Fget (def, Qmenu_alias)))
            def = XSYMBOL (def)->function;
          tem = Fwhere_is_internal (def, Qnil, Qt, Qnil);


@@ -6760,7 +6833,7 @@ parse_menu_item (item, notreal, inmenubar)
     return 1;
 
   /* If we have an equivalent key binding, use that.  */
     return 1;
 
   /* If we have an equivalent key binding, use that.  */

-  XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ] = tem;
+  AREF (item_properties, ITEM_PROPERTY_KEYEQ) = tem;

 
   /* Include this when menu help is implemented.
   tem = XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP];
 
   /* Include this when menu help is implemented.
   tem = XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP];


@@ -6774,9 +6847,9 @@ parse_menu_item (item, notreal, inmenubar)
   */
 
   /* Handle radio buttons or toggle boxes.  */ 
   */
 
   /* Handle radio buttons or toggle boxes.  */ 

-  tem = XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED];
+  tem = AREF (item_properties, ITEM_PROPERTY_SELECTED);

   if (!NILP (tem))
   if (!NILP (tem))

-    XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED]
+    AREF (item_properties, ITEM_PROPERTY_SELECTED)

       = menu_item_eval_property (tem);
 
   return 1;
       = menu_item_eval_property (tem);
 
   return 1;


@@ -6872,7 +6945,7 @@ tool_bar_items (reuse, nitems)
                                     * sizeof (maps[0]));
       bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
       if (!NILP (map))
                                     * sizeof (maps[0]));
       bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
       if (!NILP (map))

-       maps[nmaps++] = get_local_map (PT, current_buffer, keymap);
+       maps[nmaps++] = map;

       maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
     }
 
       maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
     }
 


@@ -6885,9 +6958,9 @@ tool_bar_items (reuse, nitems)
     if (!NILP (maps[i]))
       {
        Lisp_Object keymap;
     if (!NILP (maps[i]))
       {
        Lisp_Object keymap;

-      
-       keymap = get_keyelt (access_keymap (maps[i], Qtool_bar, 1, 1), 0);
-       if (!NILP (Fkeymapp (keymap)))
+
+       keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
+       if (CONSP (keymap))

          {
            Lisp_Object tail;
            
          {
            Lisp_Object tail;
            


@@ -7004,9 +7077,9 @@ parse_tool_bar_item (key, item)
   extern Lisp_Object QCbutton, QCtoggle, QCradio;
   int i;
 
   extern Lisp_Object QCbutton, QCtoggle, QCradio;
   int i;
 

-  /* Defininition looks like `(tool-bar-item CAPTION BINDING
-     PROPS...)'.  Rule out items that aren't lists, don't start with
-     `tool-bar-item' or whose rest following `tool-bar-item' is not a
+  /* Defininition looks like `(menu-item CAPTION BINDING PROPS...)'.
+     Rule out items that aren't lists, don't start with
+     `menu-item' or whose rest following `tool-bar-item' is not a

      list.  */
   if (!CONSP (item)
       || !EQ (XCAR (item), Qmenu_item)
      list.  */
   if (!CONSP (item)
       || !EQ (XCAR (item), Qmenu_item)


@@ -7050,6 +7123,10 @@ parse_tool_bar_item (key, item)
   PROP (TOOL_BAR_ITEM_BINDING) = XCAR (item);
   item = XCDR (item);
 
   PROP (TOOL_BAR_ITEM_BINDING) = XCAR (item);
   item = XCDR (item);
 

+  /* Ignore cached key binding, if any.  */
+  if (CONSP (item) && CONSP (XCAR (item)))
+    item = XCDR (item);
+

   /* Process the rest of the properties.  */
   for (; CONSP (item) && CONSP (XCDR (item)); item = XCDR (XCDR (item)))
     {
   /* Process the rest of the properties.  */
   for (; CONSP (item) && CONSP (XCDR (item)); item = XCDR (XCDR (item)))
     {


@@ -7103,7 +7180,7 @@ parse_tool_bar_item (key, item)
                                               PROP (TOOL_BAR_ITEM_BINDING))));
 
   /* See if the binding is a keymap.  Give up if it is.  */
                                               PROP (TOOL_BAR_ITEM_BINDING))));
 
   /* See if the binding is a keymap.  Give up if it is.  */

-  if (!NILP (get_keymap_1 (PROP (TOOL_BAR_ITEM_BINDING), 0, 1)))
+  if (CONSP (get_keymap (PROP (TOOL_BAR_ITEM_BINDING), 0, 1)))

     return 0;
 
   /* Enable or disable selection of item.  */
     return 0;
 
   /* Enable or disable selection of item.  */


@@ -7309,6 +7386,8 @@ read_char_minibuf_menu_prompt (commandflag, nmaps, maps)
   Lisp_Object rest, vector;
   char *menu;
 
   Lisp_Object rest, vector;
   char *menu;
 

+  vector = Qnil;
+

   if (! menu_prompting)
     return Qnil;
 
   if (! menu_prompting)
     return Qnil;
 


@@ -7412,7 +7491,7 @@ read_char_minibuf_menu_prompt (commandflag, nmaps, maps)
                  /* 1 if the char to type matches the string.  */
                  int char_matches;
                  Lisp_Object upcased_event, downcased_event;
                  /* 1 if the char to type matches the string.  */
                  int char_matches;
                  Lisp_Object upcased_event, downcased_event;

-                 Lisp_Object desc;
+                 Lisp_Object desc = Qnil;

                  Lisp_Object s
                    = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME];
 
                  Lisp_Object s
                    = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME];
 


@@ -7515,7 +7594,7 @@ read_char_minibuf_menu_prompt (commandflag, nmaps, maps)
       orig_defn_macro = current_kboard->defining_kbd_macro;
       current_kboard->defining_kbd_macro = Qnil;
       do
       orig_defn_macro = current_kboard->defining_kbd_macro;
       current_kboard->defining_kbd_macro = Qnil;
       do

-       obj = read_char (commandflag, 0, 0, Qnil, 0);
+       obj = read_char (commandflag, 0, 0, Qt, 0);

       while (BUFFERP (obj));
       current_kboard->defining_kbd_macro = orig_defn_macro;
 
       while (BUFFERP (obj));
       current_kboard->defining_kbd_macro = orig_defn_macro;
 


@@ -7562,31 +7641,6 @@ follow_key (key, nmaps, current, defs, next)
   int i, first_binding;
   int did_meta = 0;
 
   int i, first_binding;
   int did_meta = 0;
 

-  /* If KEY is a meta ASCII character, treat it like meta-prefix-char
-     followed by the corresponding non-meta character.
-     Put the results into DEFS, since we are going to alter that anyway.
-     Do not alter CURRENT or NEXT.  */
-  if (INTEGERP (key) && (XUINT (key) & CHAR_META))
-    {
-      for (i = 0; i < nmaps; i++)
-       if (! NILP (current[i]))
-         {
-           Lisp_Object def;
-           def = get_keyelt (access_keymap (current[i],
-                                            meta_prefix_char, 1, 0), 0);
-
-           /* Note that since we pass the resulting bindings through
-              get_keymap_1, non-prefix bindings for meta-prefix-char
-              disappear.  */
-           defs[i] = get_keymap_1 (def, 0, 1);
-         }
-       else
-         defs[i] = Qnil;
-
-      did_meta = 1;
-      XSETINT (key, XFASTINT (key) & ~CHAR_META);
-    }
-

   first_binding = nmaps;
   for (i = nmaps - 1; i >= 0; i--)
     {
   first_binding = nmaps;
   for (i = nmaps - 1; i >= 0; i--)
     {


@@ -7598,7 +7652,7 @@ follow_key (key, nmaps, current, defs, next)
          else
            map = current[i];
 
          else
            map = current[i];
 

-         defs[i] = get_keyelt (access_keymap (map, key, 1, 0), 1);
+         defs[i] = access_keymap (map, key, 1, 0, 1);

          if (! NILP (defs[i]))
            first_binding = i;
        }
          if (! NILP (defs[i]))
            first_binding = i;
        }


@@ -7609,7 +7663,7 @@ follow_key (key, nmaps, current, defs, next)
   /* Given the set of bindings we've found, produce the next set of maps.  */
   if (first_binding < nmaps)
     for (i = 0; i < nmaps; i++)
   /* Given the set of bindings we've found, produce the next set of maps.  */
   if (first_binding < nmaps)
     for (i = 0; i < nmaps; i++)

-      next[i] = NILP (defs[i]) ? Qnil : get_keymap_1 (defs[i], 0, 1);
+      next[i] = NILP (defs[i]) ? Qnil : get_keymap (defs[i], 0, 1);

 
   return first_binding;
 }
 
   return first_binding;
 }


@@ -7661,44 +7715,44 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
      int can_return_switch_frame;
      int fix_current_buffer;
 {
      int can_return_switch_frame;
      int fix_current_buffer;
 {

-  int count = specpdl_ptr - specpdl;
+  volatile int count = specpdl_ptr - specpdl;

 
   /* How many keys there are in the current key sequence.  */
 
   /* How many keys there are in the current key sequence.  */

-  int t;
+  volatile int t;

 
   /* The length of the echo buffer when we started reading, and
      the length of this_command_keys when we started reading.  */
 
   /* The length of the echo buffer when we started reading, and
      the length of this_command_keys when we started reading.  */

-  int echo_start;
-  int keys_start;
+  volatile int echo_start;
+  volatile int keys_start;

 
   /* The number of keymaps we're scanning right now, and the number of
      keymaps we have allocated space for.  */
 
   /* The number of keymaps we're scanning right now, and the number of
      keymaps we have allocated space for.  */

-  int nmaps;
-  int nmaps_allocated = 0;
+  volatile int nmaps;
+  volatile int nmaps_allocated = 0;

 
   /* defs[0..nmaps-1] are the definitions of KEYBUF[0..t-1] in
      the current keymaps.  */
 
   /* defs[0..nmaps-1] are the definitions of KEYBUF[0..t-1] in
      the current keymaps.  */

-  Lisp_Object *defs;
+  Lisp_Object *volatile defs = NULL;

 
   /* submaps[0..nmaps-1] are the prefix definitions of KEYBUF[0..t-1]
      in the current keymaps, or nil where it is not a prefix.  */
 
   /* submaps[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 *submaps;
+  Lisp_Object *volatile submaps = NULL;

 
   /* The local map to start out with at start of key sequence.  */
 
   /* The local map to start out with at start of key sequence.  */

-  Lisp_Object orig_local_map;
+  volatile Lisp_Object orig_local_map;

 
   /* The map from the `keymap' property to start out with at start of
      key sequence.  */
 
   /* The map from the `keymap' property to start out with at start of
      key sequence.  */

-  Lisp_Object orig_keymap;
+  volatile Lisp_Object orig_keymap;

 
   /* 1 if we have already considered switching to the local-map property
      of the place where a mouse click occurred.  */
 
   /* 1 if we have already considered switching to the local-map property
      of the place where a mouse click occurred.  */

-  int localized_local_map = 0;
+  volatile int localized_local_map = 0;

 
   /* The index in defs[] of the first keymap that has a binding for
      this key sequence.  In other words, the lowest i such that
      defs[i] is non-nil.  */
 
   /* The index in defs[] of the first keymap that has a binding for
      this key sequence.  In other words, the lowest i such that
      defs[i] is non-nil.  */

-  int first_binding;
+  volatile int first_binding;

 
   /* If t < mock_input, then KEYBUF[t] should be read as the next
      input key.
 
   /* If t < mock_input, then KEYBUF[t] should be read as the next
      input key.


@@ -7713,7 +7767,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
      restart_sequence; the loop will read keys from keybuf up until
      mock_input, thus rebuilding the state; and then it will resume
      reading characters from the keyboard.  */
      restart_sequence; the loop will read keys from keybuf up until
      mock_input, thus rebuilding the state; and then it will resume
      reading characters from the keyboard.  */

-  int mock_input = 0;
+  volatile int mock_input = 0;

 
   /* If the sequence is unbound in submaps[], then
      keybuf[fkey_start..fkey_end-1] is a prefix in Vfunction_key_map,
 
   /* If the sequence is unbound in submaps[], then
      keybuf[fkey_start..fkey_end-1] is a prefix in Vfunction_key_map,


@@ -7723,24 +7777,24 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
      should hold off until t reaches them.  We do this when we've just
      recognized a function key, to avoid searching for the function
      key's again in Vfunction_key_map.  */
      should hold off until t reaches them.  We do this when we've just
      recognized a function key, to avoid searching for the function
      key's again in Vfunction_key_map.  */

-  int fkey_start = 0, fkey_end = 0;
-  Lisp_Object fkey_map;
+  volatile int fkey_start = 0, fkey_end = 0;
+  volatile Lisp_Object fkey_map;

 
   /* Likewise, for key_translation_map.  */
 
   /* Likewise, for key_translation_map.  */

-  int keytran_start = 0, keytran_end = 0;
-  Lisp_Object keytran_map;
+  volatile int keytran_start = 0, keytran_end = 0;
+  volatile Lisp_Object keytran_map;

 
   /* If we receive a ``switch-frame'' event in the middle of a key sequence,
      we put it off for later.  While we're reading, we keep the event here.  */
 
   /* If we receive a ``switch-frame'' event in the middle of a key sequence,
      we put it off for later.  While we're reading, we keep the event here.  */

-  Lisp_Object delayed_switch_frame;
+  volatile Lisp_Object delayed_switch_frame;

 
   /* See the comment below... */
 #if defined (GOBBLE_FIRST_EVENT)
   Lisp_Object first_event;
 #endif
 
 
   /* See the comment below... */
 #if defined (GOBBLE_FIRST_EVENT)
   Lisp_Object first_event;
 #endif
 

-  Lisp_Object original_uppercase;
-  int original_uppercase_position = -1;
+  volatile Lisp_Object original_uppercase;
+  volatile int original_uppercase_position = -1;

 
   /* Gets around Microsoft compiler limitations.  */
   int dummyflag = 0;
 
   /* Gets around Microsoft compiler limitations.  */
   int dummyflag = 0;


@@ -7749,8 +7803,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
 
   /* Nonzero if we seem to have got the beginning of a binding
      in function_key_map.  */
 
   /* Nonzero if we seem to have got the beginning of a binding
      in function_key_map.  */

-  int function_key_possible = 0;
-  int key_translation_possible = 0;
+  volatile int function_key_possible = 0;
+  volatile int key_translation_possible = 0;

 
   /* Save the status of key translation before each step,
      so that we can restore this after downcasing.  */
 
   /* Save the status of key translation before each step,
      so that we can restore this after downcasing.  */


@@ -7775,11 +7829,11 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
   keytran_map = Vkey_translation_map;
 
   /* If there is no function-key-map, turn off function key scanning.  */
   keytran_map = Vkey_translation_map;
 
   /* If there is no function-key-map, turn off function key scanning.  */

-  if (NILP (Fkeymapp (Vfunction_key_map)))
+  if (!KEYMAPP (Vfunction_key_map))

     fkey_start = fkey_end = bufsize + 1;
 
   /* If there is no key-translation-map, turn off scanning.  */
     fkey_start = fkey_end = bufsize + 1;
 
   /* If there is no key-translation-map, turn off scanning.  */

-  if (NILP (Fkeymapp (Vkey_translation_map)))
+  if (!KEYMAPP (Vkey_translation_map))

     keytran_start = keytran_end = bufsize + 1;
 
   if (INTERACTIVE)
     keytran_start = keytran_end = bufsize + 1;
 
   if (INTERACTIVE)


@@ -7861,7 +7915,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                                              * sizeof (defs[0]));
            nmaps_allocated = nmaps + extra_maps;
          }
                                              * sizeof (defs[0]));
            nmaps_allocated = nmaps + extra_maps;
          }

-       bcopy (maps, submaps, nmaps * sizeof (submaps[0]));
+       bcopy (maps, (void *) submaps, nmaps * sizeof (submaps[0]));

        if (!NILP (orig_keymap))
          submaps[nmaps++] = orig_keymap;
        submaps[nmaps++] = orig_local_map;
        if (!NILP (orig_keymap))
          submaps[nmaps++] = orig_keymap;
        submaps[nmaps++] = orig_local_map;


@@ -7908,13 +7962,13 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
          (say, a mouse click on the mode line which is being treated
          as [mode-line (mouse-...)], then we backtrack to this point
          of keybuf.  */
          (say, a mouse click on the mode line which is being treated
          as [mode-line (mouse-...)], then we backtrack to this point
          of keybuf.  */

-      int last_real_key_start;
+      volatile int last_real_key_start;

 
       /* These variables are analogous to echo_start and keys_start;
         while those allow us to restart the entire key sequence,
         echo_local_start and keys_local_start allow us to throw away
         just one key.  */
 
       /* These variables are analogous to echo_start and keys_start;
         while those allow us to restart the entire key sequence,
         echo_local_start and keys_local_start allow us to throw away
         just one key.  */

-      int echo_local_start, keys_local_start, local_first_binding;
+      volatile int echo_local_start, keys_local_start, local_first_binding;

 
       if (t >= bufsize)
        error ("Key sequence too long");
 
       if (t >= bufsize)
        error ("Key sequence too long");


@@ -7987,7 +8041,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                goto replay_sequence;
              }
 #endif
                goto replay_sequence;
              }
 #endif

-           key = read_char (NILP (prompt), nmaps, submaps, last_nonmenu_event,
+           key = read_char (NILP (prompt), nmaps,
+                            (Lisp_Object *) submaps, last_nonmenu_event,

                             &used_mouse_menu);
          }
 
                             &used_mouse_menu);
          }
 


@@ -8419,22 +8474,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
              Lisp_Object key;
 
              key = keybuf[fkey_end++];
              Lisp_Object key;
 
              key = keybuf[fkey_end++];

-             /* Look up meta-characters by prefixing them
-                with meta_prefix_char.  I hate this.  */
-             if (INTEGERP (key) && XUINT (key) & meta_modifier)
-               {
-                 fkey_next
-                   = get_keymap_1
-                     (get_keyelt
-                      (access_keymap (fkey_map, meta_prefix_char, 1, 0), 0),
-                      0, 1);
-                 XSETFASTINT (key, XFASTINT (key) & ~meta_modifier);
-               }
-             else
-               fkey_next = fkey_map;
-

              fkey_next
              fkey_next

-               = get_keyelt (access_keymap (fkey_next, key, 1, 0), 1);
+               = access_keymap (fkey_map, key, 1, 0, 1);

 
              /* Handle symbol with autoload definition.  */
              if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next))
 
              /* Handle symbol with autoload definition.  */
              if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next))


@@ -8447,7 +8488,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                 or an array.  */
              if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next))
                  && (!NILP (Farrayp (XSYMBOL (fkey_next)->function))
                 or an array.  */
              if (SYMBOLP (fkey_next) && ! NILP (Ffboundp (fkey_next))
                  && (!NILP (Farrayp (XSYMBOL (fkey_next)->function))

-                     || !NILP (Fkeymapp (XSYMBOL (fkey_next)->function))))
+                     || KEYMAPP (XSYMBOL (fkey_next)->function)))

                fkey_next = XSYMBOL (fkey_next)->function;
 
 #if 0 /* I didn't turn this on, because it might cause trouble
                fkey_next = XSYMBOL (fkey_next)->function;
 
 #if 0 /* I didn't turn this on, because it might cause trouble


@@ -8520,11 +8561,11 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                  goto replay_sequence;
                }
 
                  goto replay_sequence;
                }
 

-             fkey_map = get_keymap_1 (fkey_next, 0, 1);
+             fkey_map = get_keymap (fkey_next, 0, 1);

 
              /* If we no longer have a bound suffix, try a new positions for
                 fkey_start.  */
 
              /* If we no longer have a bound suffix, try a new positions for
                 fkey_start.  */

-             if (NILP (fkey_map))
+             if (!CONSP (fkey_map))

                {
                  fkey_end = ++fkey_start;
                  fkey_map = Vfunction_key_map;
                {
                  fkey_end = ++fkey_start;
                  fkey_map = Vfunction_key_map;


@@ -8543,22 +8584,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
            Lisp_Object key;
 
            key = keybuf[keytran_end++];
            Lisp_Object key;
 
            key = keybuf[keytran_end++];

-           /* Look up meta-characters by prefixing them
-              with meta_prefix_char.  I hate this.  */
-           if (INTEGERP (key) && XUINT (key) & meta_modifier)
-             {
-               keytran_next
-                 = get_keymap_1
-                   (get_keyelt
-                    (access_keymap (keytran_map, meta_prefix_char, 1, 0), 0),
-                    0, 1);
-               XSETFASTINT (key, XFASTINT (key) & ~meta_modifier);
-             }
-           else
-             keytran_next = keytran_map;
-

            keytran_next
            keytran_next

-             = get_keyelt (access_keymap (keytran_next, key, 1, 0), 1);
+             = access_keymap (keytran_map, key, 1, 0, 1);

 
            /* Handle symbol with autoload definition.  */
            if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))
 
            /* Handle symbol with autoload definition.  */
            if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))


@@ -8571,7 +8598,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
               or an array.  */
            if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))
                && (!NILP (Farrayp (XSYMBOL (keytran_next)->function))
               or an array.  */
            if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))
                && (!NILP (Farrayp (XSYMBOL (keytran_next)->function))

-                   || !NILP (Fkeymapp (XSYMBOL (keytran_next)->function))))
+                   || KEYMAPP (XSYMBOL (keytran_next)->function)))

              keytran_next = XSYMBOL (keytran_next)->function;
            
            /* If the key translation map gives a function, not an
              keytran_next = XSYMBOL (keytran_next)->function;
            
            /* If the key translation map gives a function, not an


@@ -8635,11 +8662,11 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                goto replay_sequence;
              }
 
                goto replay_sequence;
              }
 

-           keytran_map = get_keymap_1 (keytran_next, 0, 1);
+           keytran_map = get_keymap (keytran_next, 0, 1);

 
            /* If we no longer have a bound suffix, try a new positions for
               keytran_start.  */
 
            /* If we no longer have a bound suffix, try a new positions for
               keytran_start.  */

-           if (NILP (keytran_map))
+           if (!CONSP (keytran_map))

              {
                keytran_end = ++keytran_start;
                keytran_map = Vkey_translation_map;
              {
                keytran_end = ++keytran_start;
                keytran_map = Vkey_translation_map;


@@ -8855,9 +8882,13 @@ DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
                         prompt, ! NILP (dont_downcase_last),
                         ! NILP (can_return_switch_frame), 0);
 
                         prompt, ! NILP (dont_downcase_last),
                         ! NILP (can_return_switch_frame), 0);
 

+#if 0  /* The following is fine for code reading a key sequence and
+         then proceeding with a lenghty compuation, but it's not good
+         for code reading keys in a loop, like an input method.  */

 #ifdef HAVE_X_WINDOWS
   if (display_busy_cursor_p)
     start_busy_cursor ();
 #ifdef HAVE_X_WINDOWS
   if (display_busy_cursor_p)
     start_busy_cursor ();

+#endif

 #endif
 
   if (i == -1)
 #endif
 
   if (i == -1)


@@ -9204,7 +9235,7 @@ current_active_maps (maps_p)
                                     * sizeof (maps[0]));
       bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
       if (!NILP (map))
                                     * sizeof (maps[0]));
       bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
       if (!NILP (map))

-       maps[nmaps++] = get_local_map (PT, current_buffer, keymap);
+       maps[nmaps++] = map;

       maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
     }
   maps[nmaps++] = current_global_map;
       maps[nmaps++] = get_local_map (PT, current_buffer, local_map);
     }
   maps[nmaps++] = current_global_map;


@@ -10604,6 +10635,17 @@ The default value is nil, in which case, point adjustment are\n\
 suppressed only after special commands that set\n\
 `disable-point-adjustment' (which see) to non-nil.");
   Vglobal_disable_point_adjustment = Qnil;
 suppressed only after special commands that set\n\
 `disable-point-adjustment' (which see) to non-nil.");
   Vglobal_disable_point_adjustment = Qnil;

+
+  DEFVAR_BOOL ("update-menu-bindings", &update_menu_bindings,
+    "Non-nil means updating menu bindings is allowed.\n\
+A value of nil means menu bindings should not be updated.\n\
+Used during Emacs' startup.");
+  update_menu_bindings = 1;
+
+  DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout,
+    "*How long to display an echo-area message when the minibuffer is active.\n\
+If the value is not a number, such messages don't time out.");
+  Vminibuffer_message_timeout = make_number (2);

 }
 
 void
 }
 
 void