* lisp/textmodes/css-mode.el (scss-mode): Fix typo.

Fixes: debbugs:19446

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca7a3c4581826574945a665bd1742cee5e266e1c..7620a0730a67a34f64ed844b110dfbfd141be564 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-01  Simen Heggestøyl  <simenheg@gmail.com>  (tiny change)
+
+       * textmodes/css-mode.el (scss-mode): Fix typo (bug#19446).
+
 2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 
        Less 'make' chatter in lisp directory
@@ -22781,7 +22785,7 @@ See ChangeLog.16 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2014 Free Software Foundation, Inc.
+  Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 175964392e940f83bfe8c31843d914c0a87dedb7..c171bd50f62b41d7e7219cabb4b6d50becae520e 100644 (file)
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1,6 +1,6 @@
 ;;; css-mode.el --- Major mode to edit CSS files -*- lexical-binding: t -*-
 
-;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: hypermedia
@@ -459,7 +459,7 @@
   "Major mode to edit \"Sassy CSS\" files."
   (setq-local comment-start "// ")
   (setq-local comment-end "")
-  (setq-local comment-start-skip "/[*/]+[ t]*")
+  (setq-local comment-start-skip "/[*/]+[ \t]*")
   (setq-local comment-end-skip "[ \t]*\\(?:\n\\|\\*+/\\)")
   (setq-local font-lock-defaults '(scss-font-lock-keywords nil t)))