aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorAndreas Schwab2012-05-12 21:00:30 +0200
committerAndreas Schwab2012-05-12 21:00:30 +0200
commit9879e263b19070518b6e45f71daaaf7e7021cdbd (patch)
treeacea1bcf0eb546a3bdaab8a737393b23736b2289 /doc/misc
parent78e91d0834aba27b2e823da09376b9c1bb6a8c5d (diff)
downloademacs-9879e263b19070518b6e45f71daaaf7e7021cdbd.tar.gz
emacs-9879e263b19070518b6e45f71daaaf7e7021cdbd.zip
* cc-mode.texi: Avoid space before macro in 4th argument of cross
reference commands.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog3
-rw-r--r--doc/misc/cc-mode.texi23
2 files changed, 15 insertions, 11 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 047a9b52e0b..99c14897db0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,8 @@
12012-05-12 Andreas Schwab <schwab@linux-m68k.org> 12012-05-12 Andreas Schwab <schwab@linux-m68k.org>
2 2
3 * cc-mode.texi: Avoid space before macro in 4th argument of cross
4 reference commands. (Bug#11461)
5
3 * Makefile.in (gnus.dvi): Use $@ instead of $*.dvi. 6 * Makefile.in (gnus.dvi): Use $@ instead of $*.dvi.
4 7
52012-05-02 Glenn Morris <rgm@gnu.org> 82012-05-02 Glenn Morris <rgm@gnu.org>
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 58420bbd99c..8c574be8f2a 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -701,7 +701,7 @@ in some circumstances---@code{c-insert-tab-function} then defines
701precisely what sort of ``whitespace'' this will be. Set the standard 701precisely what sort of ``whitespace'' this will be. Set the standard
702Emacs variable @code{indent-tabs-mode} to @code{t} if you want real 702Emacs variable @code{indent-tabs-mode} to @code{t} if you want real
703@samp{tab} characters to be used in the indentation, to @code{nil} if 703@samp{tab} characters to be used in the indentation, to @code{nil} if
704you want only spaces. @xref{Just Spaces,,, @emacsman{}, 704you want only spaces. @xref{Just Spaces,,,@emacsman{},
705@emacsmantitle{}}. 705@emacsmantitle{}}.
706 706
707@defopt c-tab-always-indent 707@defopt c-tab-always-indent
@@ -1058,8 +1058,8 @@ set this up for you, so you probably won't have to bother.
1058@cindex Auto Fill mode 1058@cindex Auto Fill mode
1059@cindex paragraph filling 1059@cindex paragraph filling
1060Line breaks are by default handled (almost) the same regardless of 1060Line breaks are by default handled (almost) the same regardless of
1061whether they are made by auto fill mode (@pxref{Auto Fill,,, 1061whether they are made by auto fill mode (@pxref{Auto
1062@emacsman{}, @emacsmantitle{}}), by paragraph filling (e.g. with 1062Fill,,,@emacsman{}, @emacsmantitle{}}), by paragraph filling (e.g. with
1063@kbd{M-q}), or explicitly with @kbd{M-j} or similar methods. In 1063@kbd{M-q}), or explicitly with @kbd{M-j} or similar methods. In
1064string literals, the new line gets the same indentation as the 1064string literals, the new line gets the same indentation as the
1065previous nonempty line.@footnote{You can change this default by 1065previous nonempty line.@footnote{You can change this default by
@@ -1402,7 +1402,7 @@ continuation of the preceding @code{if}.
1402@vindex abbrev-mode 1402@vindex abbrev-mode
1403@findex abbrev-mode 1403@findex abbrev-mode
1404@cindex Abbrev mode 1404@cindex Abbrev mode
1405@ccmode{} uses Abbrev mode (@pxref{Abbrevs,,, @emacsman{}, @emacsmantitle{}}) 1405@ccmode{} uses Abbrev mode (@pxref{Abbrevs,,,@emacsman{}, @emacsmantitle{}})
1406to accomplish this. It's therefore turned on by default in all language 1406to accomplish this. It's therefore turned on by default in all language
1407modes except IDL mode, since CORBA IDL doesn't have any statements. 1407modes except IDL mode, since CORBA IDL doesn't have any statements.
1408@end deffn 1408@end deffn
@@ -2295,14 +2295,14 @@ to create them.
2295A @dfn{file local variable setting} is a setting which applies to an 2295A @dfn{file local variable setting} is a setting which applies to an
2296individual source file. You put this in a @dfn{local variables list}, 2296individual source file. You put this in a @dfn{local variables list},
2297a special block at the end of the source file (@pxref{Specifying File 2297a special block at the end of the source file (@pxref{Specifying File
2298Variables,,, @emacsman{}}). 2298Variables,,,@emacsman{}}).
2299 2299
2300@item File Styles 2300@item File Styles
2301A @dfn{file style} is a rarely used variant of the ``style'' mechanism 2301A @dfn{file style} is a rarely used variant of the ``style'' mechanism
2302described above, which applies to an individual source file. 2302described above, which applies to an individual source file.
2303@xref{File Styles}. You use this by setting certain special variables 2303@xref{File Styles}. You use this by setting certain special variables
2304in a local variables list (@pxref{Specifying File Variables,,, 2304in a local variables list (@pxref{Specifying File
2305@emacsman{}}). 2305Variables,,,@emacsman{}}).
2306 2306
2307@item Hooks with Styles 2307@item Hooks with Styles
2308For ultimate flexibility, you can use hooks and styles together. For 2308For ultimate flexibility, you can use hooks and styles together. For
@@ -2897,7 +2897,7 @@ these offsets or the parent style name.
2897 2897
2898The Emacs manual describes how you can customize certain variables on a 2898The Emacs manual describes how you can customize certain variables on a
2899per-file basis by including a @dfn{file local variable} block at the end 2899per-file basis by including a @dfn{file local variable} block at the end
2900of the file (@pxref{File Variables,, Local Variables in Files, @emacsman{}, 2900of the file (@pxref{File Variables,, Local Variables in Files,@emacsman{},
2901@emacsmantitle{}}). 2901@emacsmantitle{}}).
2902 2902
2903So far, you've only seen a functional interface for setting styles in 2903So far, you've only seen a functional interface for setting styles in
@@ -3139,8 +3139,9 @@ results in the current implementation.
3139@end defopt 3139@end defopt
3140 3140
3141@vindex comment-multi-line 3141@vindex comment-multi-line
3142If inside a comment and @code{comment-multi-line} (@pxref{Auto Fill,,, 3142If inside a comment and @code{comment-multi-line} (@pxref{Auto
3143@emacsman{}, @emacsmantitle{}} is non-@code{nil}, the indentation and 3143Fill,,,@emacsman{}, @emacsmantitle{}} is non-@code{nil}, the
3144indentation and
3144line prefix are preserved. If inside a comment and 3145line prefix are preserved. If inside a comment and
3145@code{comment-multi-line} is @code{nil}, a new comment of the same 3146@code{comment-multi-line} is @code{nil}, a new comment of the same
3146type is started on the next line and indented as appropriate for 3147type is started on the next line and indented as appropriate for
@@ -6771,7 +6772,7 @@ The stuff that didn't fit in anywhere else is documented here.
6771Controls whether a final newline is enforced when the file is saved. 6772Controls whether a final newline is enforced when the file is saved.
6772The value is an association list that for each language mode specifies 6773The value is an association list that for each language mode specifies
6773the value to give to @code{require-final-newline} (@pxref{Saving 6774the value to give to @code{require-final-newline} (@pxref{Saving
6774Buffers,,, @lispref{}, @lispreftitle{}}) at mode initialization. If a 6775Buffers,,,@lispref{}, @lispreftitle{}}) at mode initialization. If a
6775language isn't present on the association list, CC Mode won't touch 6776language isn't present on the association list, CC Mode won't touch
6776@code{require-final-newline} in buffers for that language. 6777@code{require-final-newline} in buffers for that language.
6777 6778