*** empty log message ***

1 files changed, 32 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28469a70ecb..ab15b6dce76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,34 @@
+2006-04-18  Richard Stallman  <rms@gnu.org>
+
+        * tooltip.el (tooltip-mode, tooltip-use-echo-area): Doc fixes.
+
+        * imenu.el (imenu-create-index-function, imenu--index-alist)
+        (imenu--last-menubar-index-alist, imenu--make-index-alist)
+        (imenu-default-create-index-function, imenu--generic-function):
+        Doc fixes.
+
+        * image-mode.el (image-toggle-display): Handle tar and arc subfiles.
+
+        * help-mode.el (help-mode): Set view-exit-action to delete window.
+
+        * env.el (setenv): Get rid of arg UNSET.  Interactive unsetting
+        now works by passing nil as arg.
+
+        * apropos.el (apropos-print): Don't do where-is on self-insert-command.
+
+        * abbrev.el (edit-abbrevs-redefine): Temporarily widen.
+        (read-abbrev-file): Provide default when reading filename.
+
+        * files.el (enable-local-variables): Allow :all as value.
+        (hack-local-variables): Implement that value.
+        (safe-local-variable-values, safe-local-eval-forms)
+        (enable-local-variables): Mark as risky.
+        (find-file-visit-truename, kept-old-versions): Mark safe.
+
+        * time-stamp.el (time-stamp-format, time-stamp-line-limit)
+        (time-stamp-start, time-stamp-end, time-stamp-inserts-lines)
+        (time-stamp-count, time-stamp-pattern): Add safe-local-variable prop.
+
 2006-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/tcl.el (tcl-send-string, tcl-send-region):
@@ -158,6 +189,7 @@
 
         * subr.el (read-passwd): Bind `message-log-max' to nil.
 
+>>>>>>> 1.9411
 2006-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/perl-mode.el (perl-indent-new-calculate):