# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1144925747 0
# Node ID 6b2e69b964c83b9dabd036aaf69cf02fe92bb210
# Parent  e70b5899f72c0c62b2e9844c82841a128640ce3c
*** empty log message ***

diff -r e70b5899f72c -r 6b2e69b964c8 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 13 10:54:38 2006 +0000
+++ b/lisp/ChangeLog	Thu Apr 13 10:55:47 2006 +0000
@@ -1,3 +1,15 @@
+2006-04-12  Davis Herring  <herring@lanl.gov>  (tiny change)
+
+	* files.el (hack-one-local-variable-eval-safep): Recognize
+	`edebug-form-spec' for `put', but only if it passes
+	`edebug-basic-spec'.  Generalize `put' handling.
+
+	* emacs-lisp/edebug.el (edebug-basic-spec): New function for
+	vetting file-local form specs.
+
+	* allout.el (allout-layout): Autoload its `safe-local-variable'
+	property.
+
 2006-04-13  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el: (org-ctrl-c-ctrl-c): Improved documentation
diff -r e70b5899f72c -r 6b2e69b964c8 src/ChangeLog
--- a/src/ChangeLog	Thu Apr 13 10:54:38 2006 +0000
+++ b/src/ChangeLog	Thu Apr 13 10:55:47 2006 +0000
@@ -1,3 +1,8 @@
+2006-04-13  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>  (tiny change)
+
+	* print.c (Fprin1_to_string): Mention in the `doc' that the
+	behavior is modified by `print-level' and `print-length'.
+
 2006-04-13  Kenichi Handa  <handa@m17n.org>
 
 	* coding.c (setup_coding_system): If eol-type is not yet decided