* lisp/delsel.el (delete-char): Restore incorrectly erased property.

Fixes: debbugs:16795

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e797663b70a80237e7ccb40bf7b27686942e8b80..b47c19be1f93e989110711f5008693e22125e6f8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * delsel.el (delete-char): Restore incorrectly erased property
+       (bug#16795).
+
 2014-02-18  Juanma Barranquero  <lekktu@gmail.com>
 
        * frameset.el (frameset--restore-frame): When a frame is being reused
@@ -17,19 +22,18 @@
 2014-02-17  Alan Mackenzie  <acm@muc.de>
 
        Connect electric-indent-mode up with CC Mode.  Bug #15478.
-       * progmodes/cc-mode.el (c-initialize-cc-mode): add CC Mode hooks
+       * progmodes/cc-mode.el (c-initialize-cc-mode): Add CC Mode hooks
        to electric-indent-{,local-}-mode.
-       (c-basic-common-init): Set electric-indent-inhibit.  Initialise
-       c-electric-flag from electric-indent-mode.
+       (c-basic-common-init): Set electric-indent-inhibit.
+       Initialise c-electric-flag from electric-indent-mode.
        (c-electric-indent-mode-hook, c-electric-indent-local-mode-hook):
-       New hook functions which propagate electric-indent-mode to CC
-       Mode.
+       New hook functions which propagate electric-indent-mode to CC mode.
 
        * progmodes/cc-cmds.el (c-toggle-electric-state): When C-c C-l is
-       hit, toggle electric-indent-local-moode.
+       hit, toggle electric-indent-local-mode.
 
-       * electric.el (electric-indent-mode-has-been-called): New
-       variable.
+       * electric.el (electric-indent-mode-has-been-called):
+       New variable.
 
 2014-02-17  Juanma Barranquero  <lekktu@gmail.com>
 

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 92f60c87868537762e7e6220afded58e13667403..ab71e6064441f233541895090fef7d3766364dad 100644 (file)
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -181,6 +181,9 @@ See `delete-selection-helper'."
 (put 'yank 'delete-selection 'yank)
 (put 'clipboard-yank 'delete-selection 'yank)
 (put 'insert-register 'delete-selection t)
+;; delete-backward-char and delete-forward-char already delete the selection by
+;; default, but not delete-char.
+(put 'delete-char 'delete-selection 'supersede)
 
 (put 'reindent-then-newline-and-indent 'delete-selection t)
 (put 'newline-and-indent 'delete-selection t)