diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/bindings.el | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/cmds.c | 2 |
5 files changed, 16 insertions, 4 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) diff --git a/src/ChangeLog b/src/ChangeLog index c9d0e80c12f..d09fab7ca85 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-10-19 Chong Yidong <cyd@stupidchicken.com> + + * cmds.c (Fdelete_char): Doc fix. + 2010-10-19 Ken Brown <kbrown@cornell.edu> * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225). diff --git a/src/cmds.c b/src/cmds.c index e12d7c370d9..19eca771941 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -230,7 +230,7 @@ Optional second arg KILLFLAG non-nil means kill instead (save in kill ring). Interactively, N is the prefix arg, and KILLFLAG is set if N was explicitly specified. -The command `delete-forward' is preferable for interactive use. */) +The command `delete-forward-char' is preferable for interactive use. */) (Lisp_Object n, Lisp_Object killflag) { EMACS_INT pos; |