Merge from emacs-23

[gnu-emacs] / lisp / progmodes / cwarn.el

diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 5e5fb71feba7f86e6055eefb2ef64fff1811fec2..e4b380995d5eb7c31ed26b1d1b2df9c2528e9ecd 100644 (file)
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -1,6 +1,6 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;; Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
@@ -187,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.