*** empty log message ***

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

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 8ac9588..b5d6892 100644 (file)
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -165,21 +165,14 @@ Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 @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
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+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
+is included in the section entitled ``GNU Free Documentation License''.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
@@ -2604,7 +2597,7 @@ except in Java and AWK modes where it's @code{java} and @code{awk}.
 
 Remember that if you set a style variable with the Customization
 interface or at the top level of your @file{.emacs} file before the
-style system is initialised (@pxref{Config Basics}), this setting will
+style system is initialized (@pxref{Config Basics}), this setting will
 override the one that the style system would have given the variable.
 
 To set a buffer's style interactively, use the command @kbd{C-c .}
@@ -2834,7 +2827,7 @@ looked up in the alist to get the regexp for the language, and if it
 isn't found then the special symbol @samp{other} is looked up instead.
 
 When a comment line gets divided by @kbd{M-j} or the like, @ccmode{}
-inserts the comment line prefix from a neighbouring line at the start
+inserts the comment line prefix from a neighboring line at the start
 of the new line.  The default value of c-comment-prefix-regexp is
 @samp{//+\\|\\**}, which matches C++ style line comments like
 
@@ -5865,7 +5858,7 @@ foo (xyz, aaa + bbb + ccc
 Only continuation lines like this are touched, @code{nil} is returned on
 lines which are the start of an argument.
 
-Within a gcc @code{asm} block, @code{:} is recognised as an argument
+Within a gcc @code{asm} block, @code{:} is recognized as an argument
 separator, but of course only between operand specifications, not in the
 expressions for the operands.
 
@@ -6759,6 +6752,14 @@ it and font-locks it OK.  Templates used in expressions, and nested
 templates do not fare so well.  Sometimes a workaround is to refontify
 the expression after typing the closing @samp{>}.
 
+@item
+In a @dfn{k&r region} (the part of an old-fashioned C function
+declaration which specifies the types of its parameters, coming
+between the parameter list and the opening brace), there should be at
+most 20 top-level parenthesis and bracket pairs.  This limit has been
+imposed for performance reasons.  If it is violated, the source file
+might be incorrectly indented or fontified.
+
 @item
 On loading @ccmode{}, sometimes this error message appears: