(generated-autoload-file): Autoload the safe-local-variable setting.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8628f540d573be69cb1b1d26a175dacbccc7fde..bc94864ac44e0109cfabde43832da58065cca9c2 100644 (file)
--- 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>

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index d057ee028dc9d422decaab451c91e0f37c6c09c5..90943b33e49e7c8668d2702ba560a2046f2558e0 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -41,6 +41,7 @@
 A `.el' file can set this in its local variables section to make its
 autoloads go somewhere else.  The autoload file is assumed to contain a
 trailer starting with a FormFeed character.")
+;;;###autoload
 (put 'generated-autoload-file 'safe-local-variable 'stringp)
 
 ;; This feels like it should be a defconst, but MH-E sets it to