*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 5f2dc7c64982e782789ba515d26e9ee817e2880b..23211d5af2a18ab16ae589d9730153fc4300110d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -771,6 +771,11 @@ supported, but new code should use the new functions.
 
 ** New function minibuffer-selected-window.
 
+** File local variables.
+
+A file local variables list cannot specify a string with text
+properties--any specified text properties are discarded.
+
 +++
 *** The meanings of scroll-up-aggressively and scroll-down-aggressively
 have been interchanged, so that the former now controls scrolling up,
@@ -816,6 +821,9 @@ for color support on character terminal frames.  Its value can be a
 number of colors to support, or a symbol.  See the Emacs Lisp
 Reference manual for more detailed documentation.
 
+** Mode line display ignores text properties in the value
+of a variable whose `risky-local-variables' property is nil.
+
 ** Already true in Emacs 21.1, but not emphasized clearly enough:
 
 Multibyte buffers can now faithfully record all 256 character codes

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd8bdb3cb4d626d27e92b6e74c09f6d78b154360..26e0cd8869cc5844326821a127af982f65a8b996 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2002-04-06  Richard M. Stallman  <rms@gnu.org>
 
+       * files.el (display-time-string-forms): Mark as risky.
+
        * enriched.el (enriched-decode-foreground, enriched-decode-background):
        Use proper format for desired elts of `face' property.
        Don't test display-color-p; make the properties unconditionally.