*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd0951e739bfb354d3a33e2825ef60c99c604eda..17215bd7dacbc4e3f62ce1360f4f8806f898e57f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-14  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * emacs-lisp/derived.el (define-derived-mode): Add link to Elisp
+       manual to docstring.
+
+       * files.el (hack-local-variables-confirm): Add STRING argument.
+       Make the function handle non file visiting buffers correctly.
+       (hack-local-variables-prop-line, hack-local-variables)
+       (hack-one-local-variable): Use STRING arg of
+       `hack-local-variables-confirm'.
+
 2005-05-14  Michael Albinus  <michael.albinus@gmx.de>
 
        Sync with Tramp 2.0.49.
@@ -232,6 +243,9 @@
        * cus-edit.el (custom-file): Call file-chase-links.
 
        * files.el (read-directory-name): Fix previous change.
+       (hack-local-variables-confirm): New function.
+       (hack-local-variables-prop-line, hack-local-variables)
+       (hack-one-local-variable): Use it.
 
 2005-05-10  Lute Kamstra  <lute@gnu.org>