diff options
| author | Dave Mayo <dave_mayo@harvard.edu> | 2014-08-25 07:38:48 -0400 |
|---|---|---|
| committer | Dave Mayo <dave_mayo@harvard.edu> | 2014-08-25 07:39:03 -0400 |
| commit | df4e66009f0274df001978296e517e22d38631d3 (patch) | |
| tree | 1e5fb9dfffbd3f9f88446b881d27f0ddd9382678 | |
| parent | c8fd50b6eaf02f44b32ee546021671353746168f (diff) | |
| download | emmet-mode-df4e66009f0274df001978296e517e22d38631d3.tar.lz emmet-mode-df4e66009f0274df001978296e517e22d38631d3.tar.xz emmet-mode-df4e66009f0274df001978296e517e22d38631d3.zip | |
Functional wrap-with-markup!
| -rw-r--r-- | emmet-mode.el | 7 | ||||
| -rw-r--r-- | src/mode-def.el | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/emmet-mode.el b/emmet-mode.el index 1df924e..f868694 100644 --- a/emmet-mode.el +++ b/emmet-mode.el @@ -3616,6 +3616,7 @@ For more information see `emmet-mode'." (define-key map (kbd "<C-return>") 'emmet-expand-line) (define-key map (kbd "<C-M-right>") 'emmet-next-edit-point) (define-key map (kbd "<C-M-left>") 'emmet-prev-edit-point) + (define-key map (kbd "C-c w") 'emmet-wrap-with-markup) map) "Keymap for emmet minor mode.") @@ -3915,6 +3916,7 @@ accept it or skip it." (point)) (forward-char))))))) +;;;###autoload (defun emmet-wrap-with-markup (wrap-with) "Wrap region with markup." (interactive "sExpression to wrap with: ") @@ -3922,14 +3924,13 @@ accept it or skip it." (to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) (expr (concat wrap-with ">{" - (replace-regexp-in-string "\\([}{]\\)" "\\\\\&" to-wrap) + (replace-regexp-in-string "}" "!EMMET-BRACKET-REPLACEMENT!" to-wrap) "}")) - (markup (emmet-transform expr))) + (markup (replace-regexp-in-string "!EMMET-BRACKET-REPLACEMENT!" "}" (emmet-transform expr)))) (when markup (delete-region (region-beginning) (region-end)) (insert markup)))) - ;;;###autoload (defun emmet-next-edit-point (count) (interactive "^p") diff --git a/src/mode-def.el b/src/mode-def.el index dd2435d..efe08a9 100644 --- a/src/mode-def.el +++ b/src/mode-def.el @@ -127,6 +127,7 @@ For more information see `emmet-mode'." (define-key map (kbd "<C-return>") 'emmet-expand-line) (define-key map (kbd "<C-M-right>") 'emmet-next-edit-point) (define-key map (kbd "<C-M-left>") 'emmet-prev-edit-point) + (define-key map (kbd "C-c w") 'emmet-wrap-with-markup) map) "Keymap for emmet minor mode.") @@ -426,6 +427,7 @@ accept it or skip it." (point)) (forward-char))))))) +;;;###autoload (defun emmet-wrap-with-markup (wrap-with) "Wrap region with markup." (interactive "sExpression to wrap with: ") @@ -433,14 +435,13 @@ accept it or skip it." (to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) (expr (concat wrap-with ">{" - ;;FIX(replace-regexp-in-string "}" (concat "\\" "\&" to-wrap) + (replace-regexp-in-string "}" "!EMMET-BRACKET-REPLACEMENT!" to-wrap) "}")) - (markup (emmet-transform expr))) + (markup (replace-regexp-in-string "!EMMET-BRACKET-REPLACEMENT!" "}" (emmet-transform expr)))) (when markup (delete-region (region-beginning) (region-end)) (insert markup)))) - ;;;###autoload (defun emmet-next-edit-point (count) (interactive "^p") |