From efa7783b16fc91737dd74863d3d91c15cb54510b Mon Sep 17 00:00:00 2001
From: flyingleafe <flyingleafe@gmail.com>
Date: Sat, 23 Aug 2014 01:56:00 +0600
Subject: Added Sass abbrs proper cursor positioning

---
 emmet-mode.el   | 5 +++--
 src/mode-def.el | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/emmet-mode.el b/emmet-mode.el
index 090ca13..d01cca3 100644
--- a/emmet-mode.el
+++ b/emmet-mode.el
@@ -3720,8 +3720,9 @@ See also `emmet-expand-line'."
      (length str))))                             ; ok, just go to the end
 
 (defun emmet-css-next-insert-point (str)
-  (string-match ": *\\(;\\)$" str)
-  (or (match-beginning 1) (length str)))
+  (let ((regexp (if emmet-use-sass-syntax ": *\\($\\)" ": *\\(;\\)$")))
+    (string-match regexp str)
+    (or (match-beginning 1) (length str))))
 
 (defvar emmet-flash-ovl nil)
 (make-variable-buffer-local 'emmet-flash-ovl)
diff --git a/src/mode-def.el b/src/mode-def.el
index 31f9d23..3395909 100644
--- a/src/mode-def.el
+++ b/src/mode-def.el
@@ -231,8 +231,9 @@ See also `emmet-expand-line'."
      (length str))))                             ; ok, just go to the end
 
 (defun emmet-css-next-insert-point (str)
-  (string-match ": *\\(;\\)$" str)
-  (or (match-beginning 1) (length str)))
+  (let ((regexp (if emmet-use-sass-syntax ": *\\($\\)" ": *\\(;\\)$")))
+    (string-match regexp str)
+    (or (match-beginning 1) (length str))))
 
 (defvar emmet-flash-ovl nil)
 (make-variable-buffer-local 'emmet-flash-ovl)
-- 
cgit v1.2.3