Add 2010 to copyright years.

[bpt/emacs.git] / doc / misc / cc-mode.texi

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index b5d6892..6b72c69 100644 (file)
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -160,11 +160,11 @@ CC Mode
 This manual is for CC Mode in Emacs.
 
 Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
 and with the Back-Cover Texts as in (a) below.  A copy of the license
@@ -211,10 +211,13 @@ from
 @comment This appears only in the Info file, not the printed manual.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+@summarycontents
+@contents
+
 @node    Top, Introduction, (dir), (dir)
 @comment node-name, next, previous, up
 
-@ifinfo
+@ifnottex
 @top @ccmode{}
 
 @ccmode{} is a GNU Emacs mode for editing files containing C, C++,
@@ -223,7 +226,9 @@ and AWK code.  It provides syntax-based indentation, font locking, and
 has several handy commands and some minor modes to make the editing
 easier.  It does not provide tools to look up and navigate between
 functions, classes etc - there are other packages for that.
-@end ifinfo
+
+@insertcopying
+@end ifnottex
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -2181,9 +2186,10 @@ that takes precedence is the one that appears latest in this list:
 @item
 @table @asis
 @item Style
+@itemx File Style@footnote{In earlier versions of @ccmode{}, a File Style setting took precedence over any other setting apart from a File Local Variable setting.}
 @itemx Top-level command or ``customization interface''
 @itemx Hook
-@itemx File Style
+@itemx File Local Variable setting
 @end table
 @end itemize
 
@@ -2270,11 +2276,18 @@ in your @file{.emacs} file:
 See @ref{Styles} for fuller details on using @ccmode{} styles and how
 to create them.
 
+@item File Local Variable setting
+A @dfn{file local variable setting} is a setting which applies to an
+individual source file.  You put this in a @dfn{local variables list},
+a special block at the end of the source file (@pxref{Specifying File
+Variables,,, @emacsman{}}).
+
 @item File Styles
 A @dfn{file style} is a rarely used variant of the ``style'' mechanism
-described above, which applies to an individual source file.  To use
-it, you set certain Emacs local variables in a special block at the
-end of the source file.  @xref{File Styles}.
+described above, which applies to an individual source file.
+@xref{File Styles}.  You use this by setting certain special variables
+in a local variables list (@pxref{Specifying File Variables,,,
+@emacsman{}}).
 
 @item Hooks with Styles
 For ultimate flexibility, you can use hooks and styles together.  For
@@ -2777,13 +2790,11 @@ made local to that buffer, even if
 variable is virtually always non-@code{nil} anyhow, you're unlikely to
 notice this effect.}.
 
-If you set any variables, including style variables, by the file local
-variables mechanism, these settings take priority over all other
-settings, even those in your mode hooks (@pxref{CC Hooks}).  If you
-use @code{c-file-style} or @code{c-file-offsets} and also explicitly
-set a style variable in a local variable block, the explicit setting
-will take priority.
-
+If you set any variable by the file local variables mechanism, that
+setting takes priority over all other settings, even those in your
+mode hooks (@pxref{CC Hooks}).  Any individual setting of a variable
+will override one made through @code{c-file-style} or
+@code{c-file-offsets}.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 @node    Custom Filling and Breaking, Custom Auto-newlines, Config Basics, Top
 @comment node-name, next, previous, up
@@ -6986,12 +6997,6 @@ Since most @ccmode{} variables are prepended with the string
 @comment Epilogue.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-@iftex
-@page
-@summarycontents
-@contents
-@end iftex
-
 @bye
 
 @ignore