diff options
| author | flyingleafe <flyingleafe@gmail.com> | 2014-08-25 03:26:02 +0600 |
|---|---|---|
| committer | flyingleafe <flyingleafe@gmail.com> | 2014-08-25 03:26:02 +0600 |
| commit | 47ca6f1fde614435033c505a2ce4dbdf5d1be2e3 (patch) | |
| tree | 89a09ee2746d5716e6d5c98cb97d9be0500c3b44 | |
| parent | ca491081f0c2d02e15c0497fbebeabdeaa944865 (diff) | |
| parent | ec4d63f31c41941af3e85f9493ebc5cfed8be90e (diff) | |
| download | emmet-mode-47ca6f1fde614435033c505a2ce4dbdf5d1be2e3.tar.lz emmet-mode-47ca6f1fde614435033c505a2ce4dbdf5d1be2e3.tar.xz emmet-mode-47ca6f1fde614435033c505a2ce4dbdf5d1be2e3.zip | |
Merge branch 'master' of github.com:smihica/emmet-mode
Conflicts:
emmet-mode.el
src/mode-def.el
| -rw-r--r-- | emmet-mode.el | 10 | ||||
| -rw-r--r-- | src/mode-def.el | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/emmet-mode.el b/emmet-mode.el index 24af1a0..991c68e 100644 --- a/emmet-mode.el +++ b/emmet-mode.el @@ -3514,7 +3514,8 @@ tbl)) (cond ((and in-style-attr (eq char ?\")) (setq char nil)) ((member char '(?\} ?\] ?\))) - (backward-sexp) (setq char (char-before))) + (with-syntax-table (standard-syntax-table) + (backward-sexp) (setq char (char-before)))) ((eq char ?\>) (setq last-gt (point)) (backward-char) (setq char (char-before))) ((eq char ?\<) @@ -3733,9 +3734,10 @@ See also `emmet-expand-line'." (defun emmet-css-next-insert-point (str) (let ((regexp (if emmet-use-sass-syntax ": *\\($\\)" ": *\\(;\\)$"))) - (set-match-data nil t) - (string-match regexp str) - (or (match-beginning 1) (length str)))) + (save-match-data + (set-match-data nil t) + (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 4dd1e56..78c9fa4 100644 --- a/src/mode-def.el +++ b/src/mode-def.el @@ -25,7 +25,8 @@ (cond ((and in-style-attr (eq char ?\")) (setq char nil)) ((member char '(?\} ?\] ?\))) - (backward-sexp) (setq char (char-before))) + (with-syntax-table (standard-syntax-table) + (backward-sexp) (setq char (char-before)))) ((eq char ?\>) (setq last-gt (point)) (backward-char) (setq char (char-before))) ((eq char ?\<) @@ -244,9 +245,10 @@ See also `emmet-expand-line'." (defun emmet-css-next-insert-point (str) (let ((regexp (if emmet-use-sass-syntax ": *\\($\\)" ": *\\(;\\)$"))) - (set-match-data nil t) - (string-match regexp str) - (or (match-beginning 1) (length str)))) + (save-match-data + (set-match-data nil t) + (string-match regexp str) + (or (match-beginning 1) (length str))))) (defvar emmet-flash-ovl nil) (make-variable-buffer-local 'emmet-flash-ovl) |