From 6b1d71150b80dfbe4d50e78e6b4fb259931ac907 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Simen=20Heggest=C3=B8yl?= Date: Thu, 5 Feb 2015 15:35:36 -0500 Subject: [PATCH] * lisp/textmodes/css-mode.el: Handle hyphenated vars Fixes: debbugs:19263 * lisp/textmodes/css-mode.el (scss-smie--not-interpolation-p): Vars can be hyphenated. --- lisp/ChangeLog | 5 ++++- lisp/textmodes/css-mode.el | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 62c4e9a937c..f9b56421297 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,7 @@ -2015-02-05 Simen Heggestøyl (tiny change) +2015-02-05 Stefan Monnier + + * textmodes/css-mode.el (scss-smie--not-interpolation-p): Vars can be + hyphenated (bug#19263). * textmodes/css-mode.el (css-fill-paragraph): Fix filling in presence of variable interpolation (bug#19751). diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index fbaa486fd2e..f6a3ca64dd9 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -455,7 +455,7 @@ (defun scss-smie--not-interpolation-p () (save-excursion (forward-char -1) - (or (zerop (skip-chars-backward "[:alnum:]")) + (or (zerop (skip-chars-backward "-[:alnum:]")) (not (looking-back "#{\\$" (- (point) 3)))))) ;;;###autoload (add-to-list 'auto-mode-alist '("\\.scss\\'" . scss-mode)) -- 2.39.5