Mercurial > emacs
changeset 86093:d223d695f3f3
(Electric Keys, Electric Keys, Custom Macros): Fix typos.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 15 Nov 2007 15:37:44 +0000 |
| parents | 22332515837b |
| children | 7ac0826a9df7 |
| files | doc/misc/cc-mode.texi |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/cc-mode.texi Thu Nov 15 15:08:38 2007 +0000 +++ b/doc/misc/cc-mode.texi Thu Nov 15 15:37:44 2007 +0000 @@ -1228,7 +1228,7 @@ 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 @@ 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 @@ @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