[Emacs-diffs] master 8c80eb4: * lisp/textmodes/css-mode.el: Handle variable interpolation

[Stefan Monnier]

branch: master
commit 8c80eb48170eb2f02adaae08442d187eeecfbefa
Author: Simen Heggestøyl <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * lisp/textmodes/css-mode.el: Handle variable interpolation
    
    Fixes: debbugs:19751
    
    * lisp/textmodes/css-mode.el (css-fill-paragraph): Fix filling in presence
    of variable interpolation.
---
 lisp/ChangeLog             |    5 +++++
 lisp/textmodes/css-mode.el |    9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9838d68..62c4e9a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-05  Simen Heggestøyl  <address@hidden>  (tiny change)
+
+       * textmodes/css-mode.el (css-fill-paragraph): Fix filling in presence
+       of variable interpolation (bug#19751).
+
 2015-02-05  Era Eriksson  <address@hidden>
 
        * json.el (json-end-of-file): New error (bug#19768).
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index c171bd5..fbaa486 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1,4 +1,4 @@
-;;; css-mode.el --- Major mode to edit CSS files -*- lexical-binding: t -*-
+;;; css-mode.el --- Major mode to edit CSS files  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
@@ -401,11 +401,16 @@
               (cond
                ;; This is a false positive inside a string or comment.
                ((nth 8 (syntax-ppss)) nil)
+               ;; This is a false positive when encountering an
+               ;; interpolated variable (bug#19751).
+               ((eq (char-before (- (point) 1)) ?#) nil)
                ((eq (char-before) ?\})
                 (save-excursion
                   (forward-char -1)
                   (skip-chars-backward " \t")
-                  (unless (bolp) (newline))))
+                  (when (and (not (bolp))
+                             (scss-smie--not-interpolation-p))
+                    (newline))))
                (t
                 (while
                     (progn