[Emacs-diffs] /srv/bzr/emacs/trunk r102001: Decouple C-d and delete, so that the former does not delete the region.

[Chong Yidong]

------------------------------------------------------------
revno: 102001
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-19 11:43:27 -0400
message:
  Decouple C-d and delete, so that the former does not delete the region.
  
  * lisp/bindings.el (global-map): Bind C-d to delete-char and deletechar
  to delete-forward-char.
  
  * lisp/simple.el (normal-erase-is-backspace-mode): Remap delete to
  deletechar, and hence delete-forward-char.
  
  * src/cmds.c (Fdelete_char): Doc fix.
modified:
  lisp/ChangeLog
  lisp/bindings.el
  lisp/simple.el
  src/ChangeLog
  src/cmds.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-19 11:44:07 +0000
+++ b/lisp/ChangeLog    2010-10-19 15:43:27 +0000
@@ -1,3 +1,11 @@
+2010-10-19  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * repeat.el (repeat): Use read-key (bug#6256).

=== modified file 'lisp/bindings.el'
--- a/lisp/bindings.el  2010-08-29 16:17:13 +0000
+++ b/lisp/bindings.el  2010-10-19 15:43:27 +0000
@@ -824,7 +824,7 @@
 (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 @@
 ;; (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)

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2010-10-14 14:32:27 +0000
+++ b/lisp/simple.el    2010-10-19 15:43:27 +0000
@@ -6628,7 +6628,7 @@
 
             (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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-19 11:44:07 +0000
+++ b/src/ChangeLog     2010-10-19 15:43:27 +0000
@@ -1,3 +1,7 @@
+2010-10-19  Chong Yidong  <address@hidden>
+
+       * cmds.c (Fdelete_char): Doc fix.
+
 2010-10-19  Ken Brown  <address@hidden>
 
        * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225).

=== modified file 'src/cmds.c'
--- a/src/cmds.c        2010-09-24 17:48:10 +0000
+++ b/src/cmds.c        2010-10-19 15:43:27 +0000
@@ -230,7 +230,7 @@
 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;