Fixes #1974: Correct C-h behavior to ensure electric-pair deletes adjacent pairs

Author: jamescherti

evil-maps.el

@@ -447,7 +447,16 @@
     ,@(when evil-want-C-u-delete
         '(("\C-u" . evil-delete-back-to-indentation)))
     ,@(when evil-want-C-h-delete
-        '(("\C-h" . evil-delete-backward-char-and-join)))
+        '(("\C-h" . (lambda()
+                      (interactive)
+                      (let ((del-binding (key-binding (kbd "DEL"))))
+                        (when del-binding
+                          (cond
+                           ((commandp del-binding)
+                            (call-interactively del-binding))
+
+                           ((functionp del-binding)
+                            (funcall del-binding)))))))))
     ([mouse-2] . mouse-yank-primary))
   "Evil's bindings for insert & replace states.
 Used in `evil-insert-state-map' and `evil-replace-state-map',

evil-vars.el

@@ -590,8 +590,7 @@ ubiquity of prefix arguments."
                (define-key evil-replace-state-map (kbd "C-h") nil))
               ((and value
                     (not (lookup-key evil-insert-state-map (kbd "C-h"))))
-               (define-key evil-insert-state-map (kbd "C-h")
-                           'evil-delete-backward-char-and-join)
+               (define-key evil-insert-state-map (kbd "C-h") (kbd "DEL"))
                (define-key evil-replace-state-map (kbd "C-h")
                            'evil-replace-backspace))))))