[Emacs-diffs] Changes to emacs/src/macterm.c,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   06/07/18 08:12:24

Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- macterm.c   18 Jul 2006 02:58:48 -0000      1.182
+++ macterm.c   18 Jul 2006 08:12:24 -0000      1.183
@@ -10681,7 +10681,6 @@
        case autoKey:
          {
            int keycode = (er.message & keyCodeMask) >> 8;
-           int char_code = er.message & charCodeMask;
            static SInt16 last_key_script = -1;
            SInt16 current_key_script;
            UInt32 modifiers = er.modifiers, mapped_modifiers;
@@ -10764,11 +10763,6 @@
              {
                inev.kind = NON_ASCII_KEYSTROKE_EVENT;
                inev.code = 0xff00 | keycode_to_xkeysym_table [keycode];
-               /* Some keyboards (e.g., German, French ones) use
-                  different layouts for keypad keys.  */
-               if (inev.code >= 0xffaa && inev.code <= 0xffbd
-                   && char_code >= 0x2a && char_code <= 0x3d)
-                 inev.code = 0xff80 | char_code;
 #ifdef MAC_OSX
                if (modifiers & kEventKeyModifierFnMask
                    && keycode <= 0x7f
@@ -10852,7 +10846,7 @@
            if (inev.kind == NO_EVENT)
              {
                inev.kind = ASCII_KEYSTROKE_EVENT;
-               inev.code = char_code;
+               inev.code = er.message & charCodeMask;
              }
 
            inev.modifiers = mac_to_emacs_modifiers (modifiers);