Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e154ef40d7cccded4c80cd992f72613fe9399799..964fc9ab42411a990e89c37a9daf3cda7a8c4845 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-14  Simon Marshall  <simon@gnu.org>
+
+       * obsolete/fast-lock.el (fast-lock-cache-directories): Remove "."
+       from its default value and give it the risky-local-variable
+       property (CVE-2008-2142).
+
 2008-05-14  Kenichi Handa  <handa@m17n.org>
 
        * language/korean.el ("Korean"): Set `iso639-language'