diff options
| author | Simen Heggestøyl <simenheg@gmail.com> | 2015-01-01 11:19:02 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-01-01 11:19:02 -0500 |
| commit | 935fa6151b3e411c5308d62338744ff25f1a8ddb (patch) | |
| tree | e9ae9fa79a08456e39892f5b3f8e65374ae3b29a | |
| parent | 17263d51845794072bbcbfd44ea4f6ec1b8aca42 (diff) | |
| download | emacs-935fa6151b3e411c5308d62338744ff25f1a8ddb.tar.gz | |
* lisp/textmodes/css-mode.el (scss-mode): Fix typo.
Fixes: debbugs:19446
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/textmodes/css-mode.el | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca7a3c45818..7620a0730a6 100644 --- 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 175964392e9..c171bd50f62 100644 --- 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))) |