diff options
| author | Simen Heggestøyl | 2015-01-01 11:19:02 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2015-01-01 11:19:02 -0500 |
| commit | 935fa6151b3e411c5308d62338744ff25f1a8ddb (patch) | |
| tree | e9ae9fa79a08456e39892f5b3f8e65374ae3b29a | |
| parent | 17263d51845794072bbcbfd44ea4f6ec1b8aca42 (diff) | |
| download | emacs-935fa6151b3e411c5308d62338744ff25f1a8ddb.tar.gz emacs-935fa6151b3e411c5308d62338744ff25f1a8ddb.zip | |
* 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 @@ | |||
| 1 | 2015-01-01 Simen Heggestøyl <simenheg@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * textmodes/css-mode.el (scss-mode): Fix typo (bug#19446). | ||
| 4 | |||
| 1 | 2014-12-31 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-12-31 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Less 'make' chatter in lisp directory | 7 | Less 'make' chatter in lisp directory |
| @@ -22781,7 +22785,7 @@ See ChangeLog.16 for earlier changes. | |||
| 22781 | ;; coding: utf-8 | 22785 | ;; coding: utf-8 |
| 22782 | ;; End: | 22786 | ;; End: |
| 22783 | 22787 | ||
| 22784 | Copyright (C) 2011-2014 Free Software Foundation, Inc. | 22788 | Copyright (C) 2011-2015 Free Software Foundation, Inc. |
| 22785 | 22789 | ||
| 22786 | This file is part of GNU Emacs. | 22790 | This file is part of GNU Emacs. |
| 22787 | 22791 | ||
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 @@ | |||
| 1 | ;;; css-mode.el --- Major mode to edit CSS files -*- lexical-binding: t -*- | 1 | ;;; css-mode.el --- Major mode to edit CSS files -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2006-2014 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2006-2015 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: hypermedia | 6 | ;; Keywords: hypermedia |
| @@ -459,7 +459,7 @@ | |||
| 459 | "Major mode to edit \"Sassy CSS\" files." | 459 | "Major mode to edit \"Sassy CSS\" files." |
| 460 | (setq-local comment-start "// ") | 460 | (setq-local comment-start "// ") |
| 461 | (setq-local comment-end "") | 461 | (setq-local comment-end "") |
| 462 | (setq-local comment-start-skip "/[*/]+[ t]*") | 462 | (setq-local comment-start-skip "/[*/]+[ \t]*") |
| 463 | (setq-local comment-end-skip "[ \t]*\\(?:\n\\|\\*+/\\)") | 463 | (setq-local comment-end-skip "[ \t]*\\(?:\n\\|\\*+/\\)") |
| 464 | (setq-local font-lock-defaults '(scss-font-lock-keywords nil t))) | 464 | (setq-local font-lock-defaults '(scss-font-lock-keywords nil t))) |
| 465 | 465 | ||