Derive `css-mode' from `prog-mode'

* textmodes/css-mode.el (css-mode): Derive from `prog-mode'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df66d81f808f8c904589711915631656d5385bfa..621121e0f06044e726257b71e84abe50d542cee2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-31  Simen Heggestøyl  <simenheg@gmail.com>
+
+       * textmodes/css-mode.el (css-mode): Derive from `prog-mode'.
+
 2015-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * jit-lock.el (jit-lock--run-functions): Fix min/max copy&paste error.

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 3e7612aeee8970635f175b4e878d112baa790f0f..72800808e6581ca13f73c1bef5edd2b606552e0e 100644 (file)
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -370,14 +370,13 @@ pseudo-classes, and at-rules."
       (css--complete-at-rule)))
 
 ;;;###autoload
-(define-derived-mode css-mode fundamental-mode "CSS"
+(define-derived-mode css-mode prog-mode "CSS"
   "Major mode to edit Cascading Style Sheets."
   (setq-local font-lock-defaults css-font-lock-defaults)
   (setq-local comment-start "/*")
   (setq-local comment-start-skip "/\\*+[ \t]*")
   (setq-local comment-end "*/")
   (setq-local comment-end-skip "[ \t]*\\*+/")
-  (setq-local parse-sexp-ignore-comments t)
   (setq-local fill-paragraph-function 'css-fill-paragraph)
   (setq-local add-log-current-defun-function #'css-current-defun-name)
   (smie-setup css-smie-grammar #'css-smie-rules