[Emacs-diffs] Changes to emacs/man/cc-mode.texi

[Miles Bader]

Index: emacs/man/cc-mode.texi
diff -c emacs/man/cc-mode.texi:1.20 emacs/man/cc-mode.texi:1.21
*** emacs/man/cc-mode.texi:1.20 Wed Oct  2 19:24:30 2002
--- emacs/man/cc-mode.texi      Tue Feb  4 09:53:27 2003
***************
*** 18,24 ****
  
  
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! @comment 
  @comment Texinfo manual for CC Mode
  @comment Generated from the original README file by Krishna Padmasola
  @comment <address@hidden>
--- 18,24 ----
  
  
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! @comment
  @comment Texinfo manual for CC Mode
  @comment Generated from the original README file by Krishna Padmasola
  @comment <address@hidden>
***************
*** 28,34 ****
  @comment Martin Stjernholm
  @comment
  @comment Maintained by Martin Stjernholm <address@hidden>
! @comment 
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  @copying
--- 28,34 ----
  @comment Martin Stjernholm
  @comment
  @comment Maintained by Martin Stjernholm <address@hidden>
! @comment
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  @copying
***************
*** 398,404 ****
  which is the brace just after the function header.
  
  Here's another example:
! @example 
  @group
  
    1: int add( int val, int incr, int doit )
--- 398,404 ----
  which is the brace just after the function header.
  
  Here's another example:
! @example
  @group
  
    1: int add( int val, int incr, int doit )
***************
*** 889,895 ****
  @example
  @group
  
! void spam( int i ) 
  @{
          // this is a comment-only line...
      if( i == 7 )                             // but this is not
--- 889,895 ----
  @example
  @group
  
! void spam( int i )
  @{
          // this is a comment-only line...
      if( i == 7 )                             // but this is not
***************
*** 1480,1488 ****
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  The following list of commands re-indent C constructs.  Note that when
! you change your coding style, either interactively or through some other 
  means, your file does @emph{not} automatically get re-indented.  You
! will need to execute one of the following commands to see the effects of 
  your changes.
  
  @cindex GNU indent program
--- 1480,1488 ----
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  The following list of commands re-indent C constructs.  Note that when
! you change your coding style, either interactively or through some other
  means, your file does @emph{not} automatically get re-indented.  You
! will need to execute one of the following commands to see the effects of
  your changes.
  
  @cindex GNU indent program
***************
*** 1495,1501 ****
  
  Re-indenting large sections of code can take a long time.  When
  @ccmode{} reindents a region of code, it is essentially equivalent to
! hitting @kbd{TAB} on every line of the region.  Especially vulnerable is 
  code generator address@hidden particular, I have had people
  complain about the speed with which @code{lex(1)} output is re-indented.
  Lex, yacc, and other code generators usually output some pretty
--- 1495,1501 ----
  
  Re-indenting large sections of code can take a long time.  When
  @ccmode{} reindents a region of code, it is essentially equivalent to
! hitting @kbd{TAB} on every line of the region.  Especially vulnerable is
  code generator address@hidden particular, I have had people
  complain about the speed with which @code{lex(1)} output is re-indented.
  Lex, yacc, and other code generators usually output some pretty
***************
*** 1589,1595 ****
  @vindex c-progress-interval
  @vindex progress-interval (c-)
  @item c-progress-interval
! When indenting large regions of code, this variable controls how often a 
  progress message is displayed.  Set this variable to @code{nil} to
  inhibit the progress messages, or set it to an integer which is the
  interval in seconds that progress messages are displayed.
--- 1589,1595 ----
  @vindex c-progress-interval
  @vindex progress-interval (c-)
  @item c-progress-interval
! When indenting large regions of code, this variable controls how often a
  progress message is displayed.  Set this variable to @code{nil} to
  inhibit the progress messages, or set it to an integer which is the
  interval in seconds that progress messages are displayed.
***************
*** 2355,2376 ****
  
  @item
  When @code{c-default-style} is an association list, the current major
! mode is looked up to find a style name string.  In this case, this style 
! is always used exactly as specified and an error will occur if the named 
  style does not exist.
  
  @item
  If @code{c-default-style} is an association list, but the current major
! mode isn't found, then the special symbol @samp{other} is looked up.  If 
  this value is found, the associated style is used.
  
  @item
  If @samp{other} is not found, then the @samp{gnu} style is used.
  
  @item
! In all cases, the style described in @code{c-default-style} is installed 
  @emph{before} the language hooks are run, so you can always override
! this setting by including an explicit call to @code{c-set-style} in your 
  language mode hook, or in @code{c-mode-common-hook}.
  
  @end enumerate
--- 2355,2376 ----
  
  @item
  When @code{c-default-style} is an association list, the current major
! mode is looked up to find a style name string.  In this case, this style
! is always used exactly as specified and an error will occur if the named
  style does not exist.
  
  @item
  If @code{c-default-style} is an association list, but the current major
! mode isn't found, then the special symbol @samp{other} is looked up.  If
  this value is found, the associated style is used.
  
  @item
  If @samp{other} is not found, then the @samp{gnu} style is used.
  
  @item
! In all cases, the style described in @code{c-default-style} is installed
  @emph{before} the language hooks are run, so you can always override
! this setting by including an explicit call to @code{c-set-style} in your
  language mode hook, or in @code{c-mode-common-hook}.
  
  @end enumerate
***************
*** 2533,2539 ****
  like @ccmode{} to be a little more intelligent so that it aligns
  all the @samp{<<} symbols in lines 3 through 6.  To do this, we have
  to write a custom indentation function which finds the column of first
! stream operator on the first line of the statement.  Here is sample 
  lisp code implementing this:
  @example
  @group
--- 2533,2539 ----
  like @ccmode{} to be a little more intelligent so that it aligns
  all the @samp{<<} symbols in lines 3 through 6.  To do this, we have
  to write a custom indentation function which finds the column of first
! stream operator on the first line of the statement.  Here is sample
  lisp code implementing this:
  @example
  @group
***************
*** 2823,2829 ****
  code, regardless of whether @kbd{TAB} or @kbd{M-;} were used.  This
  behavior is controlled by the variable
  @code{c-indent-comments-syntactically-p}.  When @code{nil} (the
! default), @kbd{M-;} indents comment-only lines to @code{comment-column}, 
  otherwise, they are indented just as they would be if @kbd{TAB} were
  typed.
  
--- 2823,2829 ----
  code, regardless of whether @kbd{TAB} or @kbd{M-;} were used.  This
  behavior is controlled by the variable
  @code{c-indent-comments-syntactically-p}.  When @code{nil} (the
! default), @kbd{M-;} indents comment-only lines to @code{comment-column},
  otherwise, they are indented just as they would be if @kbd{TAB} were
  typed.
  
***************
*** 3374,3380 ****
  @example
  @group
  
!    1: extern "C" 
     2: @{
     3:     int thing_one( int );
     4:     int thing_two( double );
--- 3374,3380 ----
  @example
  @group
  
!    1: extern "C"
     2: @{
     3:     int thing_one( int );
     4:     int thing_two( double );
***************
*** 3412,3418 ****
  @noindent
  line 2 is given the @code{namespace-open} syntax, while line 4 is given
  the @code{namespace-close} syntax.  The analysis for line 3 yields:
! @code{((innamespace) (topmost-intro . 17))}, where @code{innamespace} is 
  a modifier similar in purpose to @code{inextern-lang} and @code{inclass}.
  
  A number of syntactic symbols are associated with parenthesis lists,
--- 3412,3418 ----
  @noindent
  line 2 is given the @code{namespace-open} syntax, while line 4 is given
  the @code{namespace-close} syntax.  The analysis for line 3 yields:
! @code{((innamespace) (topmost-intro . 17))}, where @code{innamespace} is
  a modifier similar in purpose to @code{inextern-lang} and @code{inclass}.
  
  A number of syntactic symbols are associated with parenthesis lists,
***************
*** 3423,3441 ****
  
     1: void a_function( int line1,
     2:                  int line2 );
!    3: 
     4: void a_longer_function(
     5:     int line1,
     6:     int line2
     7:     );
!    8: 
     9: void call_them( int line1, int line2 )
    10: @{
    11:     a_function(
    12:         line1,
    13:         line2
    14:         );
!   15: 
    16:     a_longer_function( line1,
    17:                        line2 );
    18: @}
--- 3423,3441 ----
  
     1: void a_function( int line1,
     2:                  int line2 );
!    3:
     4: void a_longer_function(
     5:     int line1,
     6:     int line2
     7:     );
!    8:
     9: void call_them( int line1, int line2 )
    10: @{
    11:     a_function(
    12:         line1,
    13:         line2
    14:         );
!   15:
    16:     a_longer_function( line1,
    17:                        line2 );
    18: @}
***************
*** 3475,3484 ****
     3: @{
     4:     /* this line starts a multi-line
     5:      * comment.  This line should get `c' syntax */
!    6: 
     7:     char* a_multiline_string = "This line starts a multi-line \
     8: string.  This line should get `string' syntax.";
!    9: 
    10:   note:
    11:     @{
    12: #ifdef LOCK
--- 3475,3484 ----
     3: @{
     4:     /* this line starts a multi-line
     5:      * comment.  This line should get `c' syntax */
!    6:
     7:     char* a_multiline_string = "This line starts a multi-line \
     8: string.  This line should get `string' syntax.";
!    9:
    10:   note:
    11:     @{
    12: #ifdef LOCK
***************
*** 3567,3573 ****
  @end example
  @noindent
  line 1 is given the syntactic symbol @code{cpp-macro}.  This first line
! of a macro is always given this symbol.  The second and subsequent lines 
  (e.g. lines 2 through 5) are given the @code{cpp-macro-cont} syntactic
  symbol, with a relative buffer position pointing to the @code{#} which
  starts the macro definition.
--- 3567,3573 ----
  @end example
  @noindent
  line 1 is given the syntactic symbol @code{cpp-macro}.  This first line
! of a macro is always given this symbol.  The second and subsequent lines
  (e.g. lines 2 through 5) are given the @code{cpp-macro-cont} syntactic
  symbol, with a relative buffer position pointing to the @code{#} which
  starts the macro definition.
***************
*** 3778,3784 ****
  @group
  
  main (int,
!       char **           
       )                   // c-lineup-close-paren
  
  @end group
--- 3778,3784 ----
  @group
  
  main (int,
!       char **
       )                   // c-lineup-close-paren
  
  @end group
***************
*** 3857,3863 ****
  @group
  
  class Foo
!     extends           
          Bar              // c-lineup-java-inher
  
      <--> c-basic-offset
--- 3857,3863 ----
  @group
  
  class Foo
!     extends
          Bar              // c-lineup-java-inher
  
      <--> c-basic-offset
***************
*** 3921,3928 ****
  
  if (n > 0)
      @{m+=n; n=0;@}         // c-indent-one-line-block
!                            
! <--> c-basic-offset        
  
  @end group
  @end example
--- 3921,3928 ----
  
  if (n > 0)
      @{m+=n; n=0;@}         // c-indent-one-line-block
! 
! <--> c-basic-offset
  
  @end group
  @end example
***************
*** 3954,3960 ****
  @group
  
  int *foo[] = @{
!     NULL,                 
      @address@hidden,                // c-indent-multi-line-block
  
  @end group
--- 3954,3960 ----
  @group
  
  int *foo[] = @{
!     NULL,
      @address@hidden,                // c-indent-multi-line-block
  
  @end group
***************
*** 4440,4446 ****
  XEmacs since 19.16.
  
  Due to release schedule skew, it is likely that all of these Emacsen
! have old versions of @ccmode{} and so should be upgraded.  Access to the 
  @ccmode{} source code, as well as more detailed information on Emacsen
  compatibility, etc. are all available via the Web at:
  
--- 4440,4446 ----
  XEmacs since 19.16.
  
  Due to release schedule skew, it is likely that all of these Emacsen
! have old versions of @ccmode{} and so should be upgraded.  Access to the
  @ccmode{} source code, as well as more detailed information on Emacsen
  compatibility, etc. are all available via the Web at: