(read_key_sequence):

Remove prev_(fkey|keytran}_(map|start|end) since we don't want to pass
things through those maps after downcasing events.
Enforce that keytran_end <= fkey_start, i.e. that key-translation-map
applies after function-key-map.
Make sure that keytran can be done in the middle in the sequence.
Be careful not to throw away events past the one we downcase.

2 files changed, 65 insertions, 76 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 169f4dbba62..ec5ac1f784c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2002-06-11  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * keyboard.c (read_key_sequence):
+        Remove prev_(fkey|keytran}_(map|start|end) since we don't want to pass
+        things through those maps after downcasing events.
+        Enforce that keytran_end <= fkey_start, i.e. that key-translation-map
+        applies after function-key-map.
+        Make sure that keytran can be done in the middle in the sequence.
+        Be careful not to throw away events past the one we downcase.
+
+        * lread.c (read_integer): Remove unused var `tem'.
+        (read1): Fix int/Lisp_Object mixup.
+
+        * xfaces.c (tty_lookup_color): Type bool/Lisp_Object mismatch fixed.
+
 2002-06-11  Richard M. Stallman  <rms@gnu.org>
 
         * keyboard.c (readable_events): Ignore any number of
@@ -16,12 +31,12 @@
 2002-06-08  Colin Walters  <walters@verbum.org>
 
         * textprop.c (Vchar_property_alias_alist): New variable.
-        (syms_of_textprop) <Vchar_property_alias_alist>: DEFVAR_LISP. 
+        (syms_of_textprop) <Vchar_property_alias_alist>: DEFVAR_LISP.
 
         * intervals.c (lookup_char_property): New function for looking up
         overlay and text properties, created from textget.
         (textget): Use it.
-        
+
         * intervals.h (lookup_char_property): Declare.
         (Vchar_property_alias_alist): Declare.
 
@@ -34,8 +49,8 @@
 
 2002-06-07  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        * xselect.c (lisp_data_to_selection_data): Fix last change: set
-        size_ret.
+        * xselect.c (lisp_data_to_selection_data): Fix last change:
+        set size_ret.
 
 2002-06-07  Andreas Schwab  <schwab@suse.de>
 
@@ -53,8 +68,8 @@
 
 2002-06-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
-        * fileio.c (choose_write_coding_system): Call
-        select-safe-coding-system properly.
+        * fileio.c (choose_write_coding_system):
+        Call select-safe-coding-system properly.
 
 2002-06-03  Richard M. Stallman  <rms@gnu.org>
 
@@ -67,8 +82,7 @@
 
 2002-06-03  Ken Raeburn  <raeburn@gnu.org>
 
-        * buffer.c (fix_overlays_before): Fix list-walking bug in 05-19
-        change.
+        * buffer.c (fix_overlays_before): Fix list-walking bug in 05-19 change.
 
 2002-06-02  Thien-Thi Nguyen  <ttn@gnu.org>
 
@@ -79,13 +93,13 @@
 
         * xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
         Cast `current_column' return value to int.
-        (back_to_previous_visible_line_start,
-        reseat_at_next_visible_line_start, next_element_from_buffer):
+        (back_to_previous_visible_line_start)
+        (reseat_at_next_visible_line_start, next_element_from_buffer):
         Cast `indented_beyond_p' 3rd arg to float.
 
         * indent.c (last_known_column): Now a float.
-        (current_column_1, position_indentation, current_column,
-        string_display_width): Return float.
+        (current_column_1, position_indentation, current_column)
+        (string_display_width): Return float.
         (Fcurrent_column): Cast `current_column' return value to int.
         (Fcurrent_indentation): Cast `position_indentation' retval to int.
         (indented_beyond_p): Third arg now a float.
@@ -145,8 +159,7 @@
         Vread_with_symbol_positions.
         (readevalloop, Fread, Fread_from_string): Use it.
         (read1): Use readchar_count to add symbol positions to
-        Vread_symbol_positions_list if Vread_with_symbol_positions is
-        non-nil.
+        Vread_symbol_positions_list if Vread_with_symbol_positions is non-nil.
         (syms_of_lread): DEFVAR_LISP and initialize them.
 
         * lread.c (read0, read1, read_list, read_vector, read_multibyte)
diff --git a/src/keyboard.c b/src/keyboard.c
index 6b02c399bf2..c680473c79d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8059,16 +8059,6 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
   /* List of events for which a fake prefix key has been generated.  */
   volatile Lisp_Object fake_prefixed_keys = Qnil;
 
-  /* Save the status of key translation before each step,
-     so that we can restore this after downcasing.  */
-  Lisp_Object prev_fkey_map;
-  int prev_fkey_start;
-  int prev_fkey_end;
-
-  Lisp_Object prev_keytran_map;
-  int prev_keytran_start;
-  int prev_keytran_end;
-
 #if defined (GOBBLE_FIRST_EVENT)
   int junk;
 #endif
@@ -8230,6 +8220,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
          just one key.  */
       volatile int echo_local_start, keys_local_start, local_first_binding;
 
+      /* key-translation-map is applied *after* function-key-map.  */
+      eassert (keytran_end <= fkey_start);
 
       if (first_unbound < fkey_start && first_unbound < keytran_start)
         { /* The prefix upto first_unbound has no binding and has
@@ -8766,14 +8758,6 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
       /* Record what part of this_command_keys is the current key sequence.  */
       this_single_command_key_start = this_command_key_count - t;
 
-      prev_fkey_map = fkey_map;
-      prev_fkey_start = fkey_start;
-      prev_fkey_end = fkey_end;
-
-      prev_keytran_map = keytran_map;
-      prev_keytran_start = keytran_start;
-      prev_keytran_end = keytran_end;
-
       /* If the sequence is unbound, see if we can hang a function key
          off the end of it.  We only want to scan real keyboard input
          for function key sequences, so if mock_input says that we're
@@ -8890,13 +8874,23 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                 }
             }
         }
+      else if (NILP (submaps[first_binding]))
+        /* There is a global binding and it's not a prefix.
+           There is thus no function-key in this sequence.
+           We can probably show that there can't be any afterwards either
+           but I can't seem to find a clear reason why not, so I'll
+           be conservative.
+           Moving fkey.start is important in this case to allow keytran.start
+           to go over the sequence before we return (since we keep the
+           invariant that keytran.end <= fkey.start).  */
+        (fkey_start = max (fkey_start, t), fkey_end = max (fkey_end, t));
 
       /* Look for this sequence in key-translation-map.  */
       {
         Lisp_Object keytran_next;
 
         /* Scan from keytran_end until we find a bound suffix.  */
-        while (keytran_end < t)
+        while (keytran_end < fkey_start)
           {
             Lisp_Object key;
 
@@ -8921,8 +8915,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
             /* If the key translation map gives a function, not an
                array, then call the function with one arg and use
                its value instead.  */
-            if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next))
-                && keytran_end == t)
+            if (SYMBOLP (keytran_next) && ! NILP (Ffboundp (keytran_next)))
               {
                 struct gcpro gcpro1, gcpro2, gcpro3;
                 Lisp_Object tem;
@@ -8945,36 +8938,35 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                key translation map and it's a suffix of the current
                sequence (i.e. keytran_end == t), replace it with
                the binding and restart with keytran_start at the end. */
-            if ((VECTORP (keytran_next) || STRINGP (keytran_next))
-                && keytran_end == t)
+            if ((VECTORP (keytran_next) || STRINGP (keytran_next)))
               {
                 int len = XFASTINT (Flength (keytran_next));
+                int i, diff = len - (keytran_end - keytran_start);
 
-                t = keytran_start + len;
-                if (t >= bufsize)
+                mock_input = max (t, mock_input);
+                if (mock_input + diff >= bufsize)
                   error ("Key sequence too long");
 
-                if (VECTORP (keytran_next))
-                  bcopy (XVECTOR (keytran_next)->contents,
-                         keybuf + keytran_start,
-                         (t - keytran_start) * sizeof (keybuf[0]));
-                else if (STRINGP (keytran_next))
-                  {
-                    int i;
-
-                    for (i = 0; i < len; i++)
-                      XSETFASTINT (keybuf[keytran_start + i],
-                                   XSTRING (keytran_next)->data[i]);
-                  }
-
-                mock_input = t;
-                keytran_start = keytran_end = t;
+                /* Shift the keys that are after keytran_end.  */
+                if (diff < 0)
+                  for (i = keytran_end; i < mock_input; i++)
+                    keybuf[i + diff] = keybuf[i];
+                else if (diff > 0)
+                  for (i = mock_input - 1; i >= keytran_end; i--)
+                    keybuf[i + diff] = keybuf[i];
+                /* Replace the keys between keytran_start and keytran_end
+                   with those from keytran_next.  */
+                for (i = 0; i < len; i++)
+                  keybuf[keytran_start + i]
+                    = Faref (keytran_next, make_number (i));
+
+                mock_input += diff;
+                keytran_start = keytran_end += diff;
                 keytran_map = Vkey_translation_map;
 
-                /* Don't pass the results of key-translation-map
-                   through function-key-map.  */
-                fkey_start = fkey_end = t;
-                fkey_map = Vfunction_key_map;
+                /* Adjust the function-key-map counters.  */
+                fkey_start += diff;
+                fkey_end += diff;
 
                 goto replay_sequence;
               }
@@ -9019,15 +9011,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
              the lower-case char is defined in the keymaps, because they
              might get translated through function-key-map.  */
           keybuf[t - 1] = new_key;
-          mock_input = t;
-
-          fkey_map = prev_fkey_map;
-          fkey_start = prev_fkey_start;
-          fkey_end = prev_fkey_end;
-
-          keytran_map = prev_keytran_map;
-          keytran_start = prev_keytran_start;
-          keytran_end = prev_keytran_end;
+          mock_input = max (t, mock_input);
 
           goto replay_sequence;
         }
@@ -9056,15 +9040,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
                                          XCAR (breakdown));
 
               keybuf[t - 1] = new_key;
-              mock_input = t;
-
-              fkey_map = prev_fkey_map;
-              fkey_start = prev_fkey_start;
-              fkey_end = prev_fkey_end;
-
-              keytran_map = prev_keytran_map;
-              keytran_start = prev_keytran_start;
-              keytran_end = prev_keytran_end;
+              mock_input = max (t, mock_input);
 
               goto replay_sequence;
             }