diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2007-11-15 22:13:17 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2007-11-15 22:13:17 +0000 |
| commit | 3b58b87349b6d8bae3ad7c8da3affec6d435de29 (patch) | |
| tree | da31adb2c1029aab95eb8ecb74506d070634fa5d /man | |
| parent | c954c162d5e103d1b4f77849c0b288c4987a3145 (diff) | |
| download | emacs-3b58b87349b6d8bae3ad7c8da3affec6d435de29.tar.gz | |
(Electric Keys, Custom Macros): Fix typos.
Diffstat (limited to 'man')
| -rw-r--r-- | man/ChangeLog | 4 | ||||
| -rw-r--r-- | man/cc-mode.texi | 6 |
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 @@ +2007-11-15 Juanma Barranquero <lekktu@gmail.com> + + * cc-mode.texi (Electric Keys, Custom Macros): Fix typos. + 2007-11-15 Richard Stallman <rms@gnu.org> * 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 reindent a line manually after typing, say, a @samp{@}}. A few keywords, such as @code{else}, also trigger electric action. -You can inhibit the electric behaviour described here by disabling +You can inhibit the electric behavior described here by disabling electric minor mode (@pxref{Minor Modes}). Common to all these keys is that they only behave electrically when @@ -1281,7 +1281,7 @@ whitespace before it). Additionally, you can configure @ccmode{} so that typing a slash at the start of a line within a block comment will terminate the comment. You don't need to have electric minor mode enabled to get -this behaviour. @xref{Clean-ups}. +this behavior. @xref{Clean-ups}. In AWK mode, @samp{*} and @samp{/} do not delimit comments and are not electric. @@ -6458,7 +6458,7 @@ functions to this hook, not remove them. @xref{Style Variables}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Normally, the lines in a multi-line macro are indented relative to -each other as though they were code. You can suppress this behaviour +each other as though they were code. You can suppress this behavior by setting the following user option: @defopt c-syntactic-indentation-in-macros |