[nongnu] elpa/evil-surround b11048d92a 173/175: Trim whitespace from delimeters before using for deletion/change

[ELPA Syncer]

branch: elpa/evil-surround
commit b11048d92aa253d59097a82398e142453c809692
Author: Tom Dalziel <tom_dl@hotmail.com>
Commit: Tom Dalziel <tom_dl@hotmail.com>

    Trim whitespace from delimeters before using for deletion/change
    
    Fixes #204
---
 evil-surround.el | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/evil-surround.el b/evil-surround.el
index c46abd57be..6a47d1f30b 100644
--- a/evil-surround.el
+++ b/evil-surround.el
@@ -289,6 +289,12 @@ This overlay excludes the delimeters."
       (evil-expand-range range)
       range)))
 
+(defun evil-surround--get-delims (char)
+  "Given a CHAR, return delims from the pairs alist. Trim whitespace."
+  (cl-destructuring-bind (&optional k . (o . c)) (assoc char 
evil-surround-pairs-alist)
+    (when k
+      (cons (string-trim o) (string-trim c)))))
+
 ;;;###autoload
 (defun evil-surround-delete (char &optional outer inner)
   "Delete the surrounding delimiters represented by CHAR.
@@ -306,7 +312,7 @@ between these overlays is what is deleted."
    (t
     ;; no overlays specified: create them on the basis of CHAR
     ;; and delete after use
-    (let* ((delims (cdr (assoc char evil-surround-pairs-alist)))
+    (let* ((delims (evil-surround--get-delims char))
            (outer (evil-surround-outer-overlay delims char))
            (inner (evil-surround-inner-overlay delims char)))
       (unwind-protect
@@ -330,7 +336,7 @@ overlays OUTER and INNER, which are passed to 
`evil-surround-delete'."
                             (overlay-end outer)
                             nil (if (evil-surround-valid-char-p key) key 
char))))
    (t
-    (let* ((delims (cdr (assoc char evil-surround-pairs-alist)))
+    (let* ((delims (evil-surround--get-delims char))
            (outer (evil-surround-outer-overlay delims char))
            (inner (evil-surround-inner-overlay delims char)))
       (unwind-protect