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

[Richard M. Stallman]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.281 emacs/src/keymap.c:1.282
*** emacs/src/keymap.c:1.281    Mon May  5 14:06:03 2003
--- emacs/src/keymap.c  Sat May 17 08:47:55 2003
***************
*** 412,418 ****
        {
          Lisp_Object indices[3];
  
!         map_char_table (fix_submap_inheritance, Qnil, XCAR (list),
                          keymap, 0, indices);
        }
      }
--- 412,419 ----
        {
          Lisp_Object indices[3];
  
!         map_char_table (fix_submap_inheritance, Qnil,
!                         XCAR (list), XCAR (list),
                          keymap, 0, indices);
        }
      }
***************
*** 705,711 ****
        else if (CHAR_TABLE_P (binding))
        {
          Lisp_Object indices[3];
!         map_char_table (map_keymap_char_table_item, Qnil, binding,
                          Fcons (make_save_value (fun, 0),
                                 Fcons (make_save_value (data, 0),
                                        args)),
--- 706,712 ----
        else if (CHAR_TABLE_P (binding))
        {
          Lisp_Object indices[3];
!         map_char_table (map_keymap_char_table_item, Qnil, binding, binding,
                          Fcons (make_save_value (fun, 0),
                                 Fcons (make_save_value (data, 0),
                                        args)),
***************
*** 1040,1046 ****
        {
          Lisp_Object indices[3];
          elt = Fcopy_sequence (elt);
!         map_char_table (copy_keymap_1, Qnil, elt, elt, 0, indices);
        }
        else if (VECTORP (elt))
        {
--- 1041,1047 ----
        {
          Lisp_Object indices[3];
          elt = Fcopy_sequence (elt);
!         map_char_table (copy_keymap_1, Qnil, elt, elt, elt, 0, indices);
        }
        else if (VECTORP (elt))
        {
***************
*** 1914,1920 ****
            {
              Lisp_Object indices[3];
  
!             map_char_table (accessible_keymaps_char_table, Qnil,
                              elt, Fcons (Fcons (maps, make_number 
(is_metized)),
                                          Fcons (tail, thisseq)),
                              0, indices);
--- 1915,1921 ----
            {
              Lisp_Object indices[3];
  
!             map_char_table (accessible_keymaps_char_table, Qnil, elt,
                              elt, Fcons (Fcons (maps, make_number 
(is_metized)),
                                          Fcons (tail, thisseq)),
                              0, indices);
***************
*** 2431,2437 ****
                            Fcons (Fcons (this, last),
                                   Fcons (make_number (nomenus),
                                          make_number (last_is_meta))));
!             map_char_table (where_is_internal_2, Qnil, elt, args,
                              0, indices);
              sequences = XCDR (XCAR (args));
            }
--- 2432,2438 ----
                            Fcons (Fcons (this, last),
                                   Fcons (make_number (nomenus),
                                          make_number (last_is_meta))));
!             map_char_table (where_is_internal_2, Qnil, elt, elt, args,
                              0, indices);
              sequences = XCDR (XCAR (args));
            }