HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add .info extension to @setfilename commands in doc/
[bpt/emacs.git]
/
doc
/
misc
/
cc-mode.texi
diff --git
a/doc/misc/cc-mode.texi
b/doc/misc/cc-mode.texi
index
c62d702
..
74e3485
100644
(file)
--- a/
doc/misc/cc-mode.texi
+++ b/
doc/misc/cc-mode.texi
@@
-81,8
+81,9
@@
the second with them pointing to the XEmacs manuals.
@comment No overfull hbox marks in the dvi file.
@finalout
@comment No overfull hbox marks in the dvi file.
@finalout
-@setfilename ../../info/ccmode
+@setfilename ../../info/ccmode
.info
@settitle CC Mode Manual
@settitle CC Mode Manual
+@documentencoding UTF-8
@footnotestyle end
@c The following four macros generate the filenames and titles of the
@footnotestyle end
@c The following four macros generate the filenames and titles of the
@@
-156,13
+157,13
@@
CC Mode
@copying
This manual is for CC Mode in Emacs.
@copying
This manual is for CC Mode in Emacs.
-Copyright @copyright{} 1995--201
3
Free Software Foundation, Inc.
+Copyright @copyright{} 1995--201
4
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.3 or
any later version published by the Free Software Foundation; with no
@quotation
Permission is granted to copy, distribute and/or modify this document
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
t
exts being ``A GNU Manual'',
+Invariant Sections, with the Front-Cover
T
exts 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''.
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''.
@@
-176,7
+177,7
@@
modify this GNU manual.''
@dircategory Emacs editing modes
@direntry
* CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C,
@dircategory Emacs editing modes
@direntry
* CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C,
- Java, Pike, AWK, and CORBA IDL code.
+
Java, Pike, AWK, and CORBA IDL code.
@end direntry
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@end direntry
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@
-750,12
+751,6
@@
very useful in this case.
@end itemize
@table @asis
@end itemize
@table @asis
-@item @kbd{C-j} (@code{newline-and-indent})
-@kindex C-j
-@findex newline-and-indent
-Inserts a newline and indents the new blank line, ready to start
-typing. This is a standard (X)Emacs command.
-
@item @kbd{C-M-q} (@code{c-indent-exp})
@kindex C-M-q
@findex c-indent-exp
@item @kbd{C-M-q} (@code{c-indent-exp})
@kindex C-M-q
@findex c-indent-exp
@@
-1172,7
+1167,7
@@
You can toggle each of these minor modes on and off, and you can
configure @ccmode{} so that it starts up with your favorite
combination of them (@pxref{Sample Init File}). By default, when
you initialize a buffer, electric mode and syntactic-indentation mode
configure @ccmode{} so that it starts up with your favorite
combination of them (@pxref{Sample Init File}). By default, when
you initialize a buffer, electric mode and syntactic-indentation mode
-are enabled but the other t
wo
modes are disabled.
+are enabled but the other t
hree
modes are disabled.
@ccmode{} displays the current state of the first four of these minor
modes on the modeline by appending letters to the major mode's name,
@ccmode{} displays the current state of the first four of these minor
modes on the modeline by appending letters to the major mode's name,
@@
-3920,7
+3915,7
@@
Conceptually, a line of code is always indented relative to some
position higher up in the buffer (typically the indentation of the
previous line). That position is the @dfn{anchor position} in the
syntactic element. If there is an entry after the syntactic symbol in
position higher up in the buffer (typically the indentation of the
previous line). That position is the @dfn{anchor position} in the
syntactic element. If there is an entry after the syntactic symbol in
-the syntactic element list then it's either
nil
or that anchor position.
+the syntactic element list then it's either
@code{nil}
or that anchor position.
Here is an example. Suppose we had the following code as the only thing
in a C++ buffer @footnote{The line numbers in this and future examples
Here is an example. Suppose we had the following code as the only thing
in a C++ buffer @footnote{The line numbers in this and future examples
@@
-6072,7
+6067,7
@@
suggestion to get a consistent style):
@defun c-lineup-assignments
@findex lineup-assignments (c-)
Line up the current line after the assignment operator on the first line
@defun c-lineup-assignments
@findex lineup-assignments (c-)
Line up the current line after the assignment operator on the first line
-in the statement. If there isn't any, return
nil
to allow stacking with
+in the statement. If there isn't any, return
@code{nil}
to allow stacking with
other line-up functions. If the current line contains an assignment
operator too, try to align it with the first one.
other line-up functions. If the current line contains an assignment
operator too, try to align it with the first one.
@@
-6537,7
+6532,7
@@
Return the syntactic symbol in @var{langelem}.
@defun c-langelem-pos langelem
@findex langelem-pos (c-)
@defun c-langelem-pos langelem
@findex langelem-pos (c-)
-Return the anchor position in @var{langelem}, or
nil
if there is none.
+Return the anchor position in @var{langelem}, or
@code{nil}
if there is none.
@end defun
@defun c-langelem-col langelem &optional preserve-point
@end defun
@defun c-langelem-col langelem &optional preserve-point
@@
-7052,18
+7047,20
@@
Set the variable @code{c-basic-offset}. @xref{Getting Started}.
@item
@kindex RET
@kindex C-j
@item
@kindex RET
@kindex C-j
-@emph{Why doesn't the @kbd{RET} key indent the new line?}
+@emph{Why does/doesn't the @kbd{RET} key indent the new line?}
+
+Emacs's convention used to be that @kbd{RET} just adds a newline, and that
+@kbd{C-j} adds a newline and indents it. In Emacs-24.4, this convention was
+reversed.
-Emacs's convention is that @kbd{RET} just adds a newline, and that
-@kbd{C-j} adds a newline and indents it. You can make @kbd{RET} do this
-too by adding this to your @code{c-initialization-hook}:
+If you use an older Emacs and you want @kbd{RET} do this
+too, add this to your @code{c-initialization-hook}:
@example
(define-key c-mode-base-map "\C-m" 'c-context-line-break)
@end example
@example
(define-key c-mode-base-map "\C-m" 'c-context-line-break)
@end example
-@xref{Getting Started}. This is a very common question. If you want
-this to be the default behavior, don't lobby us, lobby RMS@! @t{:-)}
+@xref{Getting Started}. This was a very common question.
@item
@emph{How do I stop my code jumping all over the place when I type?}
@item
@emph{How do I stop my code jumping all over the place when I type?}