*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c67bce150287ac33d0eb6fcdeca61ed747ed645..1f4240f15b4f96708e5223baa5eb44b7c6ef52d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,19 @@
 2000-08-17  Gerd Moellmann  <gerd@gnu.org>
 
+       * format.el (format-encode-run-method): Fix error message to say
+       `encode' instead of `decode'.  Use save-window-excursion around
+       shell-command-on-region as in format-decode-run-method because
+       shell-command-on-region can display a buffer with error output.
+       (format-decode): Don't record undo information for the decoding.
+       (format-annotate-function): Add parameter FORMAT-COUNT.  Make
+       that number part of the temporary buffer name so that more than
+       one decoding using a temporary buffer can happen safely.
+
+       * enriched.el (enriched-annotation-regexp): Use `A-Z' instead
+       of `A-z' in the regexp.
+
+       * hilit-chg.el: Fix typos in commentary.
+
        * help.el (view-emacs-news): Rewritten for new naming scheme
        for old NEWS files.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 26b9cd339d5142c880e7f864274c43d4b00d2573..8fe4c581fc4674d1c5254629d80b660721f07937 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-17  Gerd Moellmann  <gerd@gnu.org>
+
+       * fileio.c (build_annotations): Add a comment explaining the
+       return value of format-annotate-function.  Replace a spurious call
+       to Flength with a CONSP test.  Call format-annotate-function with
+       a fifth arg specifying how many times the function is been called
+       in a row, to let it choose temporary buffers appropriately.
+
 2000-08-17  Dave Love  <fx@gnu.org>
 
        * lisp.h: Remove DECLARE_INTERVALS, INITIALIZE_INTERVAL.  Don't