[Emacs-diffs] Changes to emacs/src/keyboard.c

[Stefan Monnier]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.641 emacs/src/keyboard.c:1.642
*** emacs/src/keyboard.c:1.641  Tue Nov  6 10:07:16 2001
--- emacs/src/keyboard.c        Tue Dec  4 21:51:12 2001
***************
*** 154,160 ****
  int raw_keybuf_count;
  
  #define GROW_RAW_KEYBUF                                                       
\
! if (raw_keybuf_count == XVECTOR (raw_keybuf)->size)                   \
    {                                                                   \
      int newsize = 2 * XVECTOR (raw_keybuf)->size;                     \
      Lisp_Object new;                                                  \
--- 154,160 ----
  int raw_keybuf_count;
  
  #define GROW_RAW_KEYBUF                                                       
\
!  if (raw_keybuf_count == XVECTOR (raw_keybuf)->size)                  \
    {                                                                   \
      int newsize = 2 * XVECTOR (raw_keybuf)->size;                     \
      Lisp_Object new;                                                  \
***************
*** 718,724 ****
          unsigned char *pend = p + ECHOBUFSIZE - 4;
          int char_len;
  
!         do 
            {
              PARSE_MULTIBYTE_SEQ (p, pend - p, char_len);
              p += char_len;
--- 718,724 ----
          unsigned char *pend = p + ECHOBUFSIZE - 4;
          int char_len;
  
!         do
            {
              PARSE_MULTIBYTE_SEQ (p, pend - p, char_len);
              p += char_len;
***************
*** 3235,3241 ****
  
        if (c == quit_char)
        {
!         extern SIGTYPE interrupt_signal ();
  #ifdef MULTI_KBOARD
          KBOARD *kb;
          struct input_event *sp;
--- 3235,3241 ----
  
        if (c == quit_char)
        {
!         static SIGTYPE interrupt_signal (int);
  #ifdef MULTI_KBOARD
          KBOARD *kb;
          struct input_event *sp;
***************
*** 3279,3285 ****
          }
  
          last_event_timestamp = event->timestamp;
!         interrupt_signal ();
          return;
        }
  
--- 3279,3285 ----
          }
  
          last_event_timestamp = event->timestamp;
!         interrupt_signal (0 /* dummy */);
          return;
        }
  
***************
*** 6829,6839 ****
        AREF (item_properties, ITEM_PROPERTY_DEF) = def;
      }
  
-   /* If we got no definition, this item is just unselectable text which
-      is OK in a submenu but not in the menubar.  */
-   if (NILP (def))
-     return (inmenubar ? 0 : 1);
-  
    /* Enable or disable selection of item.  */
    tem = AREF (item_properties, ITEM_PROPERTY_ENABLE);
    if (!EQ (tem, Qt))
--- 6829,6834 ----
***************
*** 6847,6852 ****
--- 6842,6852 ----
        AREF (item_properties, ITEM_PROPERTY_ENABLE) = tem;
      }
  
+   /* If we got no definition, this item is just unselectable text which
+      is OK in a submenu but not in the menubar.  */
+   if (NILP (def))
+     return (inmenubar ? 0 : 1);
+  
    /* See if this is a separate pane or a submenu.  */
    def = AREF (item_properties, ITEM_PROPERTY_DEF);
    tem = get_keymap (def, 0, 1);
***************
*** 7531,7536 ****
--- 7531,7537 ----
    char *menu;
  
    vector = Qnil;
+   name = Qnil;
  
    if (! menu_prompting)
      return Qnil;
***************
*** 7558,7564 ****
      }
  
    /* If we don't have any menus, just read a character normally.  */
!   if (mapno >= nmaps)
      return Qnil;
  
    /* Prompt string always starts with map's prompt, and a space.  */
--- 7559,7565 ----
      }
  
    /* If we don't have any menus, just read a character normally.  */
!   if (!STRINGP (name));
      return Qnil;
  
    /* Prompt string always starts with map's prompt, and a space.  */
***************
*** 7898,7903 ****
--- 7899,7907 ----
       this key sequence.  In other words, the lowest i such that
       defs[i] is non-nil.  */
    volatile int first_binding;
+   /* Index of the first key that has no binding.
+      It is useless to try fkey_start larger than that.  */
+   volatile int first_unbound;
  
    /* If t < mock_input, then KEYBUF[t] should be read as the next
       input key.
***************
*** 8029,8034 ****
--- 8033,8039 ----
    starting_buffer = current_buffer;
    function_key_possible = 0;
    key_translation_possible = 0;
+   first_unbound = bufsize + 1;
  
    /* Build our list of keymaps.
       If we recognize a function key and replace its escape sequence in
***************
*** 8094,8102 ****
       reading.  */
    while ((first_binding < nmaps && ! NILP (submaps[first_binding]))
         || (first_binding >= nmaps
!            && fkey_start < t
!            /* mock input is never part of a function key's sequence.  */
!            && mock_input <= fkey_start)
         || (first_binding >= nmaps
             && keytran_start < t && key_translation_possible)
         /* Don't return in the middle of a possible function key sequence,
--- 8099,8105 ----
       reading.  */
    while ((first_binding < nmaps && ! NILP (submaps[first_binding]))
         || (first_binding >= nmaps
!            && fkey_start < t)
         || (first_binding >= nmaps
             && keytran_start < t && key_translation_possible)
         /* Don't return in the middle of a possible function key sequence,
***************
*** 8122,8127 ****
--- 8125,8148 ----
         just one key.  */
        volatile int echo_local_start, keys_local_start, local_first_binding;
  
+ 
+       if (first_unbound < fkey_start && first_unbound < keytran_start)
+       { /* The prefix upto first_unbound has no binding and has
+            no translation left to do either, so we know it's unbound.
+            If we don't stop now, we risk staying here indefinitely
+            (if the user keeps entering fkey or keytran prefixes
+            like C-c ESC ESC ESC ESC ...)  */
+         int i;
+         for (i = first_unbound + 1; i < t; i++)
+           keybuf[i - first_unbound - 1] = keybuf[i];
+         mock_input = t - first_unbound - 1;
+         fkey_end = fkey_start -= first_unbound + 1;
+         fkey_map = Vfunction_key_map;
+         keytran_end = keytran_start -= first_unbound + 1;
+         keytran_map = Vkey_translation_map;
+         goto replay_sequence;
+       }
+ 
        if (t >= bufsize)
        error ("Key sequence too long");
  
***************
*** 8511,8516 ****
--- 8532,8540 ----
        if (first_binding >= nmaps)
        {
          Lisp_Object head;
+         
+         /* Remember the position to put an upper bound on fkey_start.  */
+         first_unbound = min (t, first_unbound);
  
          head = EVENT_HEAD (key);
          if (help_char_p (head) && t > 0)
***************
*** 9418,9424 ****
        extra_maps = 3;
        nmaps = current_minor_maps (NULL, &tmaps);
        maps = (Lisp_Object *) alloca ((nmaps + extra_maps)
!                                    * sizeof (maps[0]));
        bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
        if (!NILP (map))
        maps[nmaps++] = map;
--- 9442,9448 ----
        extra_maps = 3;
        nmaps = current_minor_maps (NULL, &tmaps);
        maps = (Lisp_Object *) alloca ((nmaps + extra_maps)
!                                     * sizeof (maps[0]));
        bcopy (tmaps, maps, nmaps * sizeof (maps[0]));
        if (!NILP (map))
        maps[nmaps++] = map;