aboutsummaryrefslogtreecommitdiffstats
path: root/src/mode-def.el
diff options
context:
space:
mode:
authorDave Mayo <dave_mayo@harvard.edu>2014-08-28 08:03:03 -0400
committerDave Mayo <dave_mayo@harvard.edu>2014-08-28 08:03:03 -0400
commite0e0a29bcf13f29c004de6c54ea2879738cc2ecb (patch)
treed86a0a007f1cea0c3571e4fa86f272aa21ed05b3 /src/mode-def.el
parentdd4aecb453b2f9ad494c9e0ca397528db2bbf2ac (diff)
downloademmet-mode-e0e0a29bcf13f29c004de6c54ea2879738cc2ecb.tar.lz
emmet-mode-e0e0a29bcf13f29c004de6c54ea2879738cc2ecb.tar.xz
emmet-mode-e0e0a29bcf13f29c004de6c54ea2879738cc2ecb.zip
Wrap using token replacement, handles multiline. Test for multiline.
Diffstat (limited to 'src/mode-def.el')
-rw-r--r--src/mode-def.el19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/mode-def.el b/src/mode-def.el
index 515b51a..e0a22b9 100644
--- a/src/mode-def.el
+++ b/src/mode-def.el
@@ -433,22 +433,11 @@ accept it or skip it."
(interactive "sExpression to wrap with: ")
(let* ((emmet-move-cursor-between-quotes nil)
(to-wrap (buffer-substring-no-properties (region-beginning) (region-end)))
- (expr (concat wrap-with
- ">{"
- (replace-regexp-in-string
- "\\$"
- "!EMMET-DOLLAR-REPLACEMENT!"
- (replace-regexp-in-string
- "}"
- "!EMMET-BRACKET-REPLACEMENT!"
- to-wrap nil t) nil t)
- "}"))
+ (expr (concat wrap-with ">{!EMMET-TO-WRAP-REPLACEMENT!}"))
(markup (replace-regexp-in-string
- "!EMMET-DOLLAR-REPLACEMENT!"
- "$"
- (replace-regexp-in-string
- "!EMMET-BRACKET-REPLACEMENT!"
- "}" (emmet-transform expr) nil t) nil t)))
+ "!EMMET-TO-WRAP-REPLACEMENT!" to-wrap
+ (emmet-transform expr)
+ t t)))
(when markup
(delete-region (region-beginning) (region-end))
(insert markup)