aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-11-15 22:13:17 +0000
committerJuanma Barranquero2007-11-15 22:13:17 +0000
commit3b58b87349b6d8bae3ad7c8da3affec6d435de29 (patch)
treeda31adb2c1029aab95eb8ecb74506d070634fa5d
parentc954c162d5e103d1b4f77849c0b288c4987a3145 (diff)
downloademacs-3b58b87349b6d8bae3ad7c8da3affec6d435de29.tar.gz
emacs-3b58b87349b6d8bae3ad7c8da3affec6d435de29.zip
(Electric Keys, Custom Macros): Fix typos.
-rw-r--r--man/ChangeLog4
-rw-r--r--man/cc-mode.texi6
2 files changed, 7 insertions, 3 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 5b4b7bc6bba..955ce866033 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
12007-11-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * cc-mode.texi (Electric Keys, Custom Macros): Fix typos.
4
12007-11-15 Richard Stallman <rms@gnu.org> 52007-11-15 Richard Stallman <rms@gnu.org>
2 6
3 * cl.texi (Equality Predicates): Delete `eql'. 7 * cl.texi (Equality Predicates): Delete `eql'.
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 423892d7d30..af16e6553f2 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -1228,7 +1228,7 @@ reindenting the line. This reindentation saves you from having to
1228reindent a line manually after typing, say, a @samp{@}}. A few 1228reindent a line manually after typing, say, a @samp{@}}. A few
1229keywords, such as @code{else}, also trigger electric action. 1229keywords, such as @code{else}, also trigger electric action.
1230 1230
1231You can inhibit the electric behaviour described here by disabling 1231You can inhibit the electric behavior described here by disabling
1232electric minor mode (@pxref{Minor Modes}). 1232electric minor mode (@pxref{Minor Modes}).
1233 1233
1234Common to all these keys is that they only behave electrically when 1234Common to all these keys is that they only behave electrically when
@@ -1281,7 +1281,7 @@ whitespace before it).
1281Additionally, you can configure @ccmode{} so that typing a slash at 1281Additionally, you can configure @ccmode{} so that typing a slash at
1282the start of a line within a block comment will terminate the 1282the start of a line within a block comment will terminate the
1283comment. You don't need to have electric minor mode enabled to get 1283comment. You don't need to have electric minor mode enabled to get
1284this behaviour. @xref{Clean-ups}. 1284this behavior. @xref{Clean-ups}.
1285 1285
1286In AWK mode, @samp{*} and @samp{/} do not delimit comments and are not 1286In AWK mode, @samp{*} and @samp{/} do not delimit comments and are not
1287electric. 1287electric.
@@ -6458,7 +6458,7 @@ functions to this hook, not remove them. @xref{Style Variables}.
6458@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 6458@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
6459 6459
6460Normally, the lines in a multi-line macro are indented relative to 6460Normally, the lines in a multi-line macro are indented relative to
6461each other as though they were code. You can suppress this behaviour 6461each other as though they were code. You can suppress this behavior
6462by setting the following user option: 6462by setting the following user option:
6463 6463
6464@defopt c-syntactic-indentation-in-macros 6464@defopt c-syntactic-indentation-in-macros