diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 694b34691de..7fa39b46727 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-04-05 Pete Williamson <petewil@chromium.org> (tiny-change) | ||
| 2 | |||
| 3 | Fix .emacs and .emacs.d/init file recursion problem for NaCl | ||
| 4 | * files.el (file-truename): Add NaCl to the exception list ms-dos uses. | ||
| 5 | |||
| 1 | 2015-04-04 Alan Mackenzie <acm@muc.de> | 6 | 2015-04-04 Alan Mackenzie <acm@muc.de> |
| 2 | 7 | ||
| 3 | * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change | 8 | * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change |