diff options
| -rw-r--r-- | emmet-mode.el | 7 | ||||
| -rw-r--r-- | src/mode-def.el | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/emmet-mode.el b/emmet-mode.el index 0c3084f..15f4f0e 100644 --- a/emmet-mode.el +++ b/emmet-mode.el @@ -3946,8 +3946,7 @@ accept it or skip it." (defun emmet-wrap-with-markup (wrap-with) "Wrap region with markup." (interactive "sExpression to wrap with: ") - (let* ((emmet-move-cursor-between-quotes nil) - (to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) + (let* ((to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) (expr (concat wrap-with ">{!EMMET-TO-WRAP-REPLACEMENT!}")) (markup (replace-regexp-in-string "!EMMET-TO-WRAP-REPLACEMENT!" to-wrap @@ -3957,6 +3956,10 @@ accept it or skip it." (delete-region (region-beginning) (region-end)) (insert markup) (indent-region (region-beginning) (region-end)) + (let ((end (region-end))) + (goto-char (region-beginning)) + (unless (ignore-errors (progn (emmet-next-edit-point 1) t)) + (goto-char end))) ))) ;;;###autoload diff --git a/src/mode-def.el b/src/mode-def.el index 8f7cdb6..ffb090a 100644 --- a/src/mode-def.el +++ b/src/mode-def.el @@ -449,8 +449,7 @@ accept it or skip it." (defun emmet-wrap-with-markup (wrap-with) "Wrap region with markup." (interactive "sExpression to wrap with: ") - (let* ((emmet-move-cursor-between-quotes nil) - (to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) + (let* ((to-wrap (buffer-substring-no-properties (region-beginning) (region-end))) (expr (concat wrap-with ">{!EMMET-TO-WRAP-REPLACEMENT!}")) (markup (replace-regexp-in-string "!EMMET-TO-WRAP-REPLACEMENT!" to-wrap @@ -460,6 +459,10 @@ accept it or skip it." (delete-region (region-beginning) (region-end)) (insert markup) (indent-region (region-beginning) (region-end)) + (let ((end (region-end))) + (goto-char (region-beginning)) + (unless (ignore-errors (progn (emmet-next-edit-point 1) t)) + (goto-char end))) ))) ;;;###autoload |