diff options
| author | Alan Mackenzie | 2011-11-03 22:10:02 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2011-11-03 22:10:02 +0000 |
| commit | bd17fdeeea1446e098cde7e33e1eea60928c4e53 (patch) | |
| tree | afc3b3082f244f22c82ccafc2caa8067e3ca6c8f /lisp/ChangeLog | |
| parent | 85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b (diff) | |
| parent | 2a58bbc1830abaf7b51cb9d94df884dc92071ddf (diff) | |
| download | emacs-bd17fdeeea1446e098cde7e33e1eea60928c4e53.tar.gz emacs-bd17fdeeea1446e098cde7e33e1eea60928c4e53.zip | |
Edit lisp/ChangeLog
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a94987284de..6352a65e4fc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-11-03 Alan Mackenzie <acm@muc.de> | ||
| 2 | |||
| 3 | * progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for | ||
| 4 | change in cc-engine.el. | ||
| 5 | |||
| 1 | 2011-11-02 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2011-11-02 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * window.el (switch-to-buffer): Use `force-same-window' interactively. | 8 | * window.el (switch-to-buffer): Use `force-same-window' interactively. |
| @@ -136,7 +141,6 @@ | |||
| 136 | 141 | ||
| 137 | * progmodes/cc-langs.el (c-defun-tactic): Move this variable to | 142 | * progmodes/cc-langs.el (c-defun-tactic): Move this variable to |
| 138 | cc-vars.el. | 143 | cc-vars.el. |
| 139 | (c-nonlabel-token-2-key): New variable for change in cc-engine.el. | ||
| 140 | 144 | ||
| 141 | * progmodes/cc-engine.el (c-beginning-of-statement-1): | 145 | * progmodes/cc-engine.el (c-beginning-of-statement-1): |
| 142 | Prevent "class foo : bar" being spuriously recognized as a label. | 146 | Prevent "class foo : bar" being spuriously recognized as a label. |