From 4b559d5637676bd2515422b24439aeef52002d33 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 1 May 2016 00:59:10 -0400
Subject: [PATCH] Add evil-embrace + integrate with evil-surround

---
 Cask              | 1 +
 core/core-evil.el | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Cask b/Cask
index 4a3e9d198..6b0dd01d9 100644
--- a/Cask
+++ b/Cask
@@ -49,6 +49,7 @@
 (depends-on "evil-search-highlight-persist")
 (depends-on "evil-snipe")
 (depends-on "evil-surround")
+(depends-on "evil-embrace")
 (depends-on "evil-visualstar")
 (depends-on "evil-plugins" :git "https://github.com/tarao/evil-plugins")
 (depends-on "evil-escape")
diff --git a/core/core-evil.el b/core/core-evil.el
index 1e8e2f1da..f3cad4a02 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -352,13 +352,17 @@
                 (cons '(?\\ . narf/evil-surround-escaped)
                       evil-surround-pairs-alist))
 
-  (add-hook! org-mode
-    (push '(?l . narf/evil-surround-latex) evil-surround-pairs-alist))
   (add-hook! emacs-lisp-mode
     (push '(?\` . ("`" . "'")) evil-surround-pairs-alist))
   (add-hook! python-mode
     (push '((?d . ("\"\"\"" . "\"\"\""))) evil-surround-pairs-alist)))
 
+(use-package evil-embrace
+  :after evil-surround
+  :config
+  (evil-embrace-enable-evil-surround-integration)
+  (embrace-add-pair-regexp ?\\ "\\[[{(]" "\\[]})]" 'narf/evil-surround-escaped))
+
 (use-package evil-visualstar
   :commands (global-evil-visualstar-mode
              evil-visualstar/begin-search