[elpa] externals/objed 8e86602 212/216: Change del-insert binding, leave binding DEL free

[Stefan Monnier]

branch: externals/objed
commit 8e86602194bc9c5cfa75aee96ac416603b26849f
Author: Clemens Radermacher <address@hidden>
Commit: Clemens Radermacher <address@hidden>

    Change del-insert binding, leave binding DEL free
---
 README.asc |  6 +++---
 objed.el   | 11 +++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README.asc b/README.asc
index 4fcc51a..78a9544 100644
--- a/README.asc
+++ b/README.asc
@@ -241,7 +241,7 @@ determining the context:
 |kbd:[j]
 |Move point to the other side of the current object.
 
-|kbd:[i]
+|kbd:[^]
 |Toggle the state of the current object (inner/whole).
 |===
 
@@ -298,8 +298,8 @@ commands" below):
 |===
 |Shortcut |Purpose
 
-|kbd:[DEL]
-|Delete current object(s) and switch to insert. For char object mimic usual 
DEL behaviour.
+|kbd:[i]
+|Delete current object(s) and switch to insert.
 
 |kbd:[k]
 |Kill current object(s).
diff --git a/objed.el b/objed.el
index 92881de..a391f18 100644
--- a/objed.el
+++ b/objed.el
@@ -680,7 +680,8 @@ BEFORE and AFTER are forms to execute before/after calling 
the command."
     (define-key map "o" 'objed-expand-context)
     (define-key map "u" 'objed-upto-context)
 
-    (define-key map "i" 'objed-toggle-state)
+    (define-key map "i" 'objed-del-insert)
+    (define-key map "^" 'objed-toggle-state)
     (define-key map "j" 'objed-toggle-side)
 
     ;; marking/unmarking
@@ -698,8 +699,6 @@ BEFORE and AFTER are forms to execute before/after calling 
the command."
     (define-key map "k" 'objed-kill)
     (define-key map "w" 'objed-copy)
     (define-key map "d" 'objed-delete)
-    (define-key map (kbd "DEL") 'objed-del-insert)
-    (define-key map (kbd "<backspace>") 'objed-del-insert)
 
     (define-key map "y" 'objed-yank)
 
@@ -2125,11 +2124,7 @@ append it to the `kill-ring'."
 (defun objed-del-insert ()
   "Delete current object and exit to insert state."
   (interactive)
-  ;; keep usual behaviour so there
-  ;; is no confusion
-  (if (eq objed--object 'char)
-      (delete-char -1)
-    (delete-region (objed--beg) (objed--end)))
+  (delete-region (objed--beg) (objed--end))
   (objed--exit-objed))
 
 (defvar objed--electric-event nil