diff options
| author | Paul Eggert | 2011-10-29 10:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-29 10:33:13 -0700 |
| commit | 8d0eb4c275581847990b85dbb350caa3df9e653f (patch) | |
| tree | c161f977d59ac3103b04dc0f4aea57c83436a456 /doc/misc/ChangeLog | |
| parent | 929bb973dd3faf1655f03ac758942d5b009354ad (diff) | |
| parent | 196e41e4aec1a44ec5b6e9bed485185ba872ae67 (diff) | |
| download | emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.tar.gz emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.zip | |
Merge from trunk.
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 6b0ef9c5d8b..10a0d5e7a91 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,15 @@ | |||
| 1 | 2011-10-28 Alan Mackenzie <acm@muc.de> | ||
| 2 | |||
| 3 | * cc-mode.texi (Indentation Commands): Mention "macros with semicolons". | ||
| 4 | (Other Special Indentations): Add an xref to "Macros with ;". | ||
| 5 | (Customizing Macros): Add stuff about syntax in macros. Add an xref to | ||
| 6 | "Macros with ;". | ||
| 7 | (Macros with ;): New page. | ||
| 8 | |||
| 9 | * progmodes/cc-mode.texi (Movement Commands): Document | ||
| 10 | `c-defun-tactic'. Document the new handling of nested scopes for | ||
| 11 | movement by defuns. | ||
| 12 | |||
| 1 | 2011-10-23 Michael Albinus <michael.albinus@gmx.de> | 13 | 2011-10-23 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 14 | ||
| 3 | Sync with Tramp 2.2.3. | 15 | Sync with Tramp 2.2.3. |