Switch to recommended form of GPLv3 permissions notice.

[bpt/emacs.git] / lisp / textmodes / css-mode.el

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 8660f75..7cda675 100644 (file)
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1,24 +1,24 @@
 ;;; css-mode.el --- Major mode to edit CSS files
 
-;; Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: hypermedia
 
-;; This file is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -177,6 +177,7 @@
 
 (defcustom css-electric-keys '(?\} ?\;) ;; '()
   "Self inserting keys which should trigger re-indentation."
+  :version "22.2"
   :type '(repeat character)
   :options '((?\} ?\;))
   :group 'css)
@@ -256,11 +257,9 @@
 (defvar css-font-lock-defaults
   '(css-font-lock-keywords nil t))
 
-(unless (fboundp 'prog-mode) (defalias 'prog-mode 'fundamental-mode))
-
 ;;;###autoload (add-to-list 'auto-mode-alist '("\\.css\\'" . css-mode))
 ;;;###autoload
-(define-derived-mode css-mode prog-mode "CSS"
+(define-derived-mode css-mode fundamental-mode "CSS"
   "Major mode to edit Cascading Style Sheets."
   (set (make-local-variable 'font-lock-defaults) css-font-lock-defaults)
   (set (make-local-variable 'comment-start) "/*")
@@ -401,6 +400,7 @@
 
 (defcustom css-indent-offset 4
   "Basic size of one indentation step."
+  :version "22.2"
   :type 'integer
   :group 'css)