# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1017954644 0
# Node ID 307a3e75b2f72d0c2e5380586d906e9c3698bff1
# Parent  ea58bae14724885f896fbdc26e7b67e82a9c899b
*** empty log message ***

diff -r ea58bae14724 -r 307a3e75b2f7 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 04 21:10:36 2002 +0000
+++ b/lisp/ChangeLog	Thu Apr 04 21:10:44 2002 +0000
@@ -1,5 +1,7 @@
 2002-04-04  Richard M. Stallman  <rms@gnu.org>
 
+	* calendar/solar.el (solar-northern-spring-or-summer-season): Doc fix.
+
 	* mail/mailabbrev.el (mail-abbrev-make-syntax-table):
 	Use (syntax-table), not old-syntax-table.
 
diff -r ea58bae14724 -r 307a3e75b2f7 src/ChangeLog
--- a/src/ChangeLog	Thu Apr 04 21:10:36 2002 +0000
+++ b/src/ChangeLog	Thu Apr 04 21:10:44 2002 +0000
@@ -1,3 +1,11 @@
+2002-04-04  Richard M. Stallman  <rms@gnu.org>
+
+	* xdisp.c (display_mode_element): New arg RISKY.
+	Disregard text props found or specified within a variable
+	that isn't marked risky-local-variable.
+	(Qrisky_local_variable): New variable.
+	(syms_of_xdisp): Init and staticpro it.
+
 2002-04-03  Juanma Barranquero  <lektu@terra.es>
 
 	* doc.c (Fdocumentation): Add missing parentheses.