diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:03:46 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:03:46 -0300 |
| commit | 33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4 (patch) | |
| tree | 946ccc8bdc1f41a2c4066e6fcef4bfd04a9d693a /doc/emacs/programs.texi | |
| parent | 85ca47671ccbffe87d6ccad17039b49d6b676d61 (diff) | |
| parent | 8ee825c35b62768e28fe825163dea90d3ab46022 (diff) | |
| download | emacs-33ab7ee0edcb3608e4a3d5deebc2b72c180dbfe4.tar.gz | |
Merge from origin/emacs-24
8ee825c doc/emacs/programs.texi (Custom C Indent): Fix a typo. (Bug#19647)
88ba49f Fix coding.c subscript error
3ea1b31 Prevent artist-mode from creating runaway timers (Bug#6130).
Diffstat (limited to 'doc/emacs/programs.texi')
| -rw-r--r-- | doc/emacs/programs.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 8f6111dfa24..609392f6bb7 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -546,7 +546,7 @@ your selected @dfn{style} with the syntactic construct and adds this onto the indentation of the @dfn{anchor statement}. @table @kbd -@item C-c . @key{RET} @var{style} @key{RET} +@item C-c . @var{style} @key{RET} Select a predefined style @var{style} (@code{c-set-style}). @end table |