1 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8628f540d5..bc94864ac44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/autoload.el (generated-autoload-file): Autoload the
+        safe-local-variable setting.
+
 2007-07-14  David Kastrup  <dak@gnu.org>
 
         * emacs-lisp/advice.el (defadvice): Doc fix.
@@ -17,8 +22,8 @@
         (bookmark-map): Bind it to "o".
 
         http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html
-        and its thread contains discussion about this change.  The
-        original patch was slightly tweaked by Karl Fogel
+        and its thread contains discussion about this change.
+        The original patch was slightly tweaked by Karl Fogel
         <kfogel@red-bean.com> before committing.
 
 2007-07-13  Karl Fogel  <kfogel@red-bean.com>
@@ -29,7 +34,7 @@
 
         * bookmark.el: Don't define bookmark keys under the "C-xr" map;
         instead, make "C-xp" a prefix for bookmark-map.  Patch by Drew
-        Adams <drew.adams{_AT_}oracle.com>, mildly tweaked by me.  See
+        Adams <drew.adams@oracle.com>, mildly tweaked by me.  See
         http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00633.html.
 
 2007-07-13  Carsten Dominik  <dominik@science.uva.nl>