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

Author: jamescherti

evil-maps.el

@@ -447,7 +447,7 @@
     ,@(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" . evil--call-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

@@ -574,6 +574,13 @@ ubiquity of prefix arguments."
                       'evil-search-yank-word))
              (define-key evil-ex-search-keymap (kbd "C-w") nil))))))
 
+(defun evil--call-del-binding ()
+  "Call the same function as the DEL binding."
+  (interactive)
+  (let ((del-binding (key-binding (kbd "DEL"))))
+    (when del-binding
+      (funcall del-binding))))
+
 (defcustom evil-want-C-h-delete nil
   "Whether `C-h' deletes a char in Insert state."
   :type 'boolean
@@ -591,7 +598,7 @@ ubiquity of prefix arguments."
               ((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)
+                           'evil--call-del-binding)
                (define-key evil-replace-state-map (kbd "C-h")
                            'evil-replace-backspace))))))