aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Mayo <pobocks@gmail.com>2014-08-24 21:28:21 -0400
committerDave Mayo <pobocks@gmail.com>2014-08-24 21:28:21 -0400
commit5b7aed673d83715f7f96910e6459415d094d5860 (patch)
treeb7c819d81027e2121256da58827c5cc59baf9413 /src
parent288fbf15b73b391e339e45573739688c3be8b7ae (diff)
downloademmet-mode-5b7aed673d83715f7f96910e6459415d094d5860.tar.lz
emmet-mode-5b7aed673d83715f7f96910e6459415d094d5860.tar.xz
emmet-mode-5b7aed673d83715f7f96910e6459415d094d5860.zip
Make emmet-next-edit-point respect "emmet-move-cursor-between-quotes"
Diffstat (limited to 'src')
-rw-r--r--src/mode-def.el11
1 files changed, 8 insertions, 3 deletions
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)