3 files changed, 11 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d9a1a46bf6..394cfdd61d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el (global-map): Bind C-d to delete-char and deletechar
+        to delete-forward-char.
+
+        * simple.el (normal-erase-is-backspace-mode): Remap delete to
+        deletechar, and hence delete-forward-char.
+
 2010-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * repeat.el (repeat): Use read-key (bug#6256).
diff --git a/lisp/bindings.el b/lisp/bindings.el
index d19db2c779e..9c802e53a56 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -824,7 +824,7 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key global-map [?\C-\M--] 'negative-argument)
 
 (define-key global-map "\177" 'delete-backward-char)
-(define-key global-map "\C-d" 'delete-forward-char)
+(define-key global-map "\C-d" 'delete-char)
 
 (define-key global-map "\C-k" 'kill-line)
 (define-key global-map "\C-w" 'kill-region)
@@ -933,7 +933,7 @@ if `inhibit-field-text-motion' is non-nil."
 ;; (define-key global-map [clearline]   'function-key-error)
 (define-key global-map [insertline]     'open-line)
 (define-key global-map [deleteline]     'kill-line)
-(define-key global-map [deletechar]     'delete-char)
+(define-key global-map [deletechar]     'delete-forward-char)
 ;; (define-key global-map [backtab]     'function-key-error)
 ;; (define-key global-map [f1]          'function-key-error)
 ;; (define-key global-map [f2]          'function-key-error)
diff --git a/lisp/simple.el b/lisp/simple.el
index 5c0615e08c4..3ecfaa26e83 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6628,7 +6628,7 @@ See also `normal-erase-is-backspace'."
 
              (if enabled
                  (progn
-                   (define-key local-function-key-map [delete] [?\C-d])
+                   (define-key local-function-key-map [delete] [deletechar])
                    (define-key local-function-key-map [kp-delete] [?\C-d])
                    (define-key local-function-key-map [backspace] [?\C-?])
                    (dolist (b bindings)