diff options
| author | Dave Mayo <pobocks@gmail.com> | 2014-08-24 21:28:21 -0400 |
|---|---|---|
| committer | Dave Mayo <pobocks@gmail.com> | 2014-08-24 21:28:21 -0400 |
| commit | 5b7aed673d83715f7f96910e6459415d094d5860 (patch) | |
| tree | b7c819d81027e2121256da58827c5cc59baf9413 | |
| parent | 288fbf15b73b391e339e45573739688c3be8b7ae (diff) | |
| download | emmet-mode-5b7aed673d83715f7f96910e6459415d094d5860.tar.lz emmet-mode-5b7aed673d83715f7f96910e6459415d094d5860.tar.xz emmet-mode-5b7aed673d83715f7f96910e6459415d094d5860.zip | |
Make emmet-next-edit-point respect "emmet-move-cursor-between-quotes"
| -rw-r--r-- | emmet-mode.el | 11 | ||||
| -rw-r--r-- | src/mode-def.el | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/emmet-mode.el b/emmet-mode.el index 2b4ddf7..55bbb17 100644 --- a/emmet-mode.el +++ b/emmet-mode.el @@ -3881,9 +3881,14 @@ accept it or skip it." ((between-tags (if only-before-closed-tag "\\(><\\)/" "\\(><\\)")) (indented-line "\\(^[[:blank:]]+$\\)") - (between-quotes "\\(=\\(\"\\|'\\)\\{2\\}\\)") - (edit-point (format "\\(%s\\|%s\\|%s\\)" - between-tags indented-line between-quotes))) + (between-quotes + (if emmet-move-cursor-between-quotes "\\(=\\(\"\\|'\\)\\{2\\}\\)" nil)) + (whole-regex + (mapconcat 'identity + (delq nil + (list between-tags indented-line between-quotes)) + "\\|")) + (edit-point (format "\\(%s\\)" whole-regex))) (if (> count 0) (progn (forward-char) diff --git a/src/mode-def.el b/src/mode-def.el index 7cac58d..d64b4eb 100644 --- a/src/mode-def.el +++ b/src/mode-def.el @@ -392,9 +392,14 @@ accept it or skip it." ((between-tags (if only-before-closed-tag "\\(><\\)/" "\\(><\\)")) (indented-line "\\(^[[:blank:]]+$\\)") - (between-quotes "\\(=\\(\"\\|'\\)\\{2\\}\\)") - (edit-point (format "\\(%s\\|%s\\|%s\\)" - between-tags indented-line between-quotes))) + (between-quotes + (if emmet-move-cursor-between-quotes "\\(=\\(\"\\|'\\)\\{2\\}\\)" nil)) + (whole-regex + (mapconcat 'identity + (delq nil + (list between-tags indented-line between-quotes)) + "\\|")) + (edit-point (format "\\(%s\\)" whole-regex))) (if (> count 0) (progn (forward-char) |