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

[Kenichi Handa]

Index: emacs/src/keymap.c
diff -c emacs/src/keymap.c:1.282.4.3 emacs/src/keymap.c:1.282.4.4
*** emacs/src/keymap.c:1.282.4.3        Sun Nov 16 20:06:37 2003
--- emacs/src/keymap.c  Sat Nov 22 06:04:01 2003
***************
*** 826,835 ****
    if (!CONSP (keymap) || !EQ (XCAR (keymap), Qkeymap))
      error ("attempt to define a key in a non-keymap");
  
!   /* If idx is a list (some sort of mouse click, perhaps?),
!      the index we want to use is the car of the list, which
!      ought to be a symbol.  */
!   idx = EVENT_HEAD (idx);
  
    /* If idx is a symbol, it might have modifiers, which need to
       be put in the canonical order.  */
--- 826,840 ----
    if (!CONSP (keymap) || !EQ (XCAR (keymap), Qkeymap))
      error ("attempt to define a key in a non-keymap");
  
!   /* If idx is a cons, and the car part is a character, idx must be of
!      the form (FROM-CHAR . TO-CHAR).  */
!   if (CONSP (idx) && CHARACTERP (XCAR (idx)))
!     CHECK_CHARACTER_CDR (idx);
!   else
!     /* If idx is a list (some sort of mouse click, perhaps?),
!        the index we want to use is the car of the list, which
!        ought to be a symbol.  */
!     idx = EVENT_HEAD (idx);
  
    /* If idx is a symbol, it might have modifiers, which need to
       be put in the canonical order.  */