Merge from emacs-23

[bpt/emacs.git] / lisp / progmodes / cwarn.el

diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 9dfd4dd..c22f03f 100644 (file)
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -1,18 +1,19 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
 
-;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Keywords: c, languages, faces
 ;; X-Url: http://www.andersl.com/emacs
-;; Version: 1.3.1  1999-12-13
+;; Version: 1.3.1
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +21,7 @@
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -188,6 +187,8 @@ deactivated."
 (define-minor-mode cwarn-mode
   "Minor mode that highlights suspicious C and C++ constructions.
 
+Suspicious constructs are highlighted using `font-lock-warning-face'.
+
 Note, in addition to enabling this minor mode, the major mode must
 be included in the variable `cwarn-configuration'.  By default C and
 C++ modes are included.
@@ -371,8 +372,8 @@ The mode is turned if some feature is enabled for the current
   (if (cwarn-is-enabled major-mode) (turn-on-cwarn-mode)))
 
 ;;;###autoload
-(easy-mmode-define-global-mode global-cwarn-mode cwarn-mode
-                              turn-on-cwarn-mode-if-enabled)
+(define-globalized-minor-mode global-cwarn-mode
+  cwarn-mode turn-on-cwarn-mode-if-enabled)
 
 (provide 'cwarn)
 
@@ -380,5 +381,5 @@ The mode is turned if some feature is enabled for the current
 
 ;;}}}
 
-;;; arch-tag: 225fb5e2-0838-4eb1-88ce-3811c5e4d738
+;; arch-tag: 225fb5e2-0838-4eb1-88ce-3811c5e4d738
 ;;; cwarn.el ends here