Re: [OS X] Delete key should delete forward

[YAMAMOTO Mitsuharu]

>>>>> On Sun, 06 Feb 2005 20:56:59 +0100, Jesper Harder <address@hidden> said:

> Hi, In the carbon Emacs build, the key labelled "delete" and with an
> arrow pointing to the right should delete forward. 

How about this patch?

                                     YAMAMOTO Mitsuharu
                                address@hidden

Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.338
diff -c -r1.338 startup.el
*** lisp/startup.el     12 Feb 2005 18:00:53 -0000      1.338
--- lisp/startup.el     21 Feb 2005 09:22:17 -0000
***************
*** 748,754 ****
--- 748,757 ----
    (unless noninteractive
      ;; DOS/Windows systems have a PC-type keyboard which has both
      ;; <delete> and <backspace> keys.
+     ;; On Mac, Delete and Forward Delete keys are mapped to
+     ;; <backspace> and <delete>, respectively.
      (when (or (memq system-type '(ms-dos windows-nt))
+             (eq window-system 'mac)
              (and (memq window-system '(x))
                   (fboundp 'x-backspace-delete-keys-p)
                   (x-backspace-delete-keys-p))
Index: lisp/term/mac-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/mac-win.el,v
retrieving revision 1.32
diff -c -r1.32 mac-win.el
*** lisp/term/mac-win.el        20 Jan 2005 18:13:48 -0000      1.32
--- lisp/term/mac-win.el        21 Feb 2005 08:11:05 -0000
***************
*** 1015,1020 ****
--- 1015,1022 ----
  (define-key function-key-map [M-tab] [?\M-\t])
  (define-key function-key-map [backspace] [127])
  (define-key function-key-map [M-backspace] [?\M-\d])
+ (define-key function-key-map [delete] [127])
+ (define-key function-key-map [M-delete] [?\M-\d])
  (define-key function-key-map [escape] [?\e])
  (define-key function-key-map [M-escape] [?\M-\e])
  
***************
*** 1023,1028 ****
--- 1025,1031 ----
  (put 'return 'ascii-character 13)
  (put 'tab 'ascii-character ?\t)
  (put 'backspace 'ascii-character 127)
+ (put 'delete 'ascii-character 127)
  (put 'escape 'ascii-character ?\e)
  
  
Index: src/macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.102
diff -c -r1.102 macterm.c
*** src/macterm.c       3 Feb 2005 11:57:36 -0000       1.102
--- src/macterm.c       21 Feb 2005 08:08:34 -0000
***************
*** 8432,8438 ****
  #endif
  
  /* Table for translating Mac keycode to X keysym values.  Contributed
!    by Sudhir Shenoy.  */
  static unsigned char keycode_to_xkeysym_table[] = {
    /*0x00*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
    /*0x10*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
--- 8432,8439 ----
  #endif
  
  /* Table for translating Mac keycode to X keysym values.  Contributed
!    by Sudhir Shenoy.
!    Mapping for special keys is now identical to that in Apple X11. */
  static unsigned char keycode_to_xkeysym_table[] = {
    /*0x00*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
    /*0x10*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
***************
*** 8444,8450 ****
    /*0x3C*/ 0, 0, 0, 0,
  
    /*0x40*/ 0, 0xae /*kp-.*/, 0, 0xaa /*kp-**/,
!   /*0x44*/ 0, 0xab /*kp-+*/, 0, 0x7f /*kp-clear*/,
    /*0x48*/ 0, 0, 0, 0xaf /*kp-/*/,
    /*0x4C*/ 0x8d /*kp-enter*/, 0, 0xad /*kp--*/, 0,
  
--- 8445,8451 ----
    /*0x3C*/ 0, 0, 0, 0,
  
    /*0x40*/ 0, 0xae /*kp-.*/, 0, 0xaa /*kp-**/,
!   /*0x44*/ 0, 0xab /*kp-+*/, 0, 0x1b /*clear->escape*/,
    /*0x48*/ 0, 0, 0, 0xaf /*kp-/*/,
    /*0x4C*/ 0x8d /*kp-enter*/, 0, 0xad /*kp--*/, 0,
  
***************
*** 8458,8466 ****
    /*0x68*/ 0, 0xca /*f13*/, 0, 0xcb /*f14*/,
    /*0x6C*/ 0, 0xc7 /*f10*/, 0, 0xc9 /*f12*/,
  
!   /*0x70*/ 0, 0xcc /*f15*/, 0x9e /*insert (or 0x6a==help)*/, 0x95 /*home*/,
!   /*0x74*/ 0x9a /*pgup*/, 0x9f /*delete*/, 0xc1 /*f4*/, 0x9c /*end*/,
!   /*0x78*/ 0xbf /*f2*/, 0x9b /*pgdown*/, 0xbe /*f1*/, 0x51 /*left*/,
    /*0x7C*/ 0x53 /*right*/, 0x54 /*down*/, 0x52 /*up*/, 0
  };
  
--- 8459,8467 ----
    /*0x68*/ 0, 0xca /*f13*/, 0, 0xcb /*f14*/,
    /*0x6C*/ 0, 0xc7 /*f10*/, 0, 0xc9 /*f12*/,
  
!   /*0x70*/ 0, 0xcc /*f15*/, 0x6a /*help*/, 0x50 /*home*/,
!   /*0x74*/ 0x55 /*pgup*/, 0xff /*delete*/, 0xc1 /*f4*/, 0x57 /*end*/,
!   /*0x78*/ 0xbf /*f2*/, 0x56 /*pgdown*/, 0xbe /*f1*/, 0x51 /*left*/,
    /*0x7C*/ 0x53 /*right*/, 0x54 /*down*/, 0x52 /*up*/, 0
  };