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

[Richard M . Stallman]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.310 emacs/src/keymap.c:1.311
*** emacs/src/keymap.c:1.310    Fri Dec  2 13:47:11 2005
--- emacs/src/keymap.c  Sun Dec 11 15:35:14 2005
***************
*** 396,401 ****
--- 396,402 ----
          if (EQ (XCDR (prev), parent))
            RETURN_UNGCPRO (parent);
  
+         CHECK_IMPURE (prev);
          XSETCDR (prev, parent);
          break;
        }
***************
*** 913,918 ****
--- 914,920 ----
          {
            if (NATNUMP (idx) && XFASTINT (idx) < ASIZE (elt))
              {
+               CHECK_IMPURE (elt);
                ASET (elt, XFASTINT (idx), def);
                return def;
              }
***************
*** 938,943 ****
--- 940,946 ----
          {
            if (EQ (idx, XCAR (elt)))
              {
+               CHECK_IMPURE (elt);
                XSETCDR (elt, def);
                return def;
              }
***************
*** 955,960 ****
--- 958,964 ----
    keymap_end:
      /* We have scanned the entire keymap, and not found a binding for
         IDX.  Let's add one.  */
+     CHECK_IMPURE (insertion_point);
      XSETCDR (insertion_point,
             Fcons (Fcons (idx, def), XCDR (insertion_point)));
    }
***************
*** 1217,1223 ****
  that is, characters or symbols in it except for the last one
  fail to be a valid sequence of prefix characters in KEYMAP.
  The number is how many characters at the front of KEY
! it takes to reach a non-prefix command.
  
  Normally, `lookup-key' ignores bindings for t, which act as default
  bindings, used when nothing else in the keymap applies; this makes it
--- 1221,1227 ----
  that is, characters or symbols in it except for the last one
  fail to be a valid sequence of prefix characters in KEYMAP.
  The number is how many characters at the front of KEY
! it takes to reach a non-prefix key.
  
  Normally, `lookup-key' ignores bindings for t, which act as default
  bindings, used when nothing else in the keymap applies; this makes it
***************
*** 3836,3844 ****
  
  
    DEFVAR_LISP ("function-key-map", &Vfunction_key_map,
!              doc: /* Keymap mapping ASCII function key sequences onto their 
preferred forms.
! This allows Emacs to recognize function keys sent from ASCII
! terminals at any point in a key sequence.
  
  The `read-key-sequence' function replaces any subsequence bound by
  `function-key-map' with its binding.  More precisely, when the active
--- 3840,3848 ----
  
  
    DEFVAR_LISP ("function-key-map", &Vfunction_key_map,
!              doc: /* Keymap that translates key sequences to key sequences 
during input.
! This is used mainly for mapping ASCII function key sequences into
! real Emacs function key events (symbols).
  
  The `read-key-sequence' function replaces any subsequence bound by
  `function-key-map' with its binding.  More precisely, when the active